From ce7c969358ddb0b6816e101344e685d730babd64 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 15 Apr 2010 14:58:24 +0000
Subject: [PATCH] Stupid poor blank lines, stupid poor blank lines...

---
 archivers/rar/Makefile                         | 6 +++---
 archivers/rar/pkg/MESSAGE                      | 1 -
 benchmarks/xengine/Makefile                    | 4 ++--
 benchmarks/xengine/pkg/MESSAGE                 | 1 -
 databases/sharedance/Makefile                  | 3 ++-
 databases/sharedance/pkg/MESSAGE               | 1 -
 editors/openoffice3/Makefile                   | 4 ++--
 editors/openoffice3/pkg/MESSAGE-main           | 1 -
 lang/jikes/Makefile                            | 4 ++--
 lang/jikes/pkg/MESSAGE                         | 2 --
 lang/python/2.5/Makefile                       | 4 ++--
 lang/python/2.5/pkg/MESSAGE-tools              | 1 -
 lang/python/2.6/Makefile                       | 4 ++--
 lang/python/2.6/pkg/MESSAGE-tools              | 1 -
 mail/avenger/Makefile                          | 4 ++--
 mail/avenger/pkg/MESSAGE                       | 2 --
 mail/dkim-milter/Makefile                      | 3 ++-
 mail/dkim-milter/pkg/MESSAGE                   | 1 -
 misc/xcdroast/Makefile                         | 4 ++--
 misc/xcdroast/pkg/MESSAGE                      | 2 --
 net/ipfreely/Makefile                          | 4 ++--
 net/ipfreely/pkg/MESSAGE                       | 1 -
 net/olsrd/Makefile                             | 4 ++--
 net/olsrd/pkg/MESSAGE                          | 1 -
 net/pure-ftpd/Makefile                         | 3 ++-
 net/pure-ftpd/pkg/MESSAGE                      | 1 -
 net/snort/Makefile                             | 3 ++-
 net/snort/pkg/MESSAGE                          | 1 -
 net/snort/pkg/MESSAGE-prelude                  | 1 -
 net/trickle/Makefile                           | 4 ++--
 net/trickle/pkg/MESSAGE                        | 2 --
 net/wide-dhcp/Makefile                         | 4 ++--
 net/wide-dhcp/pkg/MESSAGE                      | 1 -
 security/cfs/Makefile                          | 4 ++--
 security/cfs/pkg/MESSAGE                       | 1 -
 security/prelude/libpreludedb/Makefile         | 4 ++--
 security/prelude/libpreludedb/pkg/MESSAGE-main | 1 -
 security/prelude/lml/Makefile                  | 3 ++-
 security/prelude/lml/pkg/MESSAGE               | 1 -
 security/prelude/pflogger/Makefile             | 4 ++--
 security/prelude/pflogger/pkg/MESSAGE          | 1 -
 security/prelude/prewikka/Makefile             | 4 ++--
 security/prelude/prewikka/pkg/MESSAGE          | 1 -
 telephony/pjsua/Makefile                       | 4 ++--
 telephony/pjsua/pkg/MESSAGE                    | 1 -
 textproc/swish-e/Makefile                      | 3 ++-
 textproc/swish-e/pkg/MESSAGE                   | 1 -
 www/py-django/Makefile                         | 4 ++--
 www/py-django/pkg/MESSAGE                      | 1 -
 www/squid/Makefile                             | 4 ++--
 www/squid/pkg/MESSAGE                          | 1 -
 www/zendframework/Makefile                     | 3 ++-
 www/zendframework/pkg/MESSAGE                  | 1 -
 x11/jmk-fonts/Makefile                         | 4 ++--
 x11/jmk-fonts/pkg/MESSAGE                      | 2 --
 55 files changed, 55 insertions(+), 81 deletions(-)

diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index a1217c6c47a..779cbafce8f 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2007/09/15 10:14:33 espie Exp $
+# $OpenBSD: Makefile,v 1.41 2010/04/15 14:58:24 ajacoutot Exp $
 
 ONLY_FOR_ARCHS=	i386 sparc
 
@@ -12,11 +12,11 @@ DISTNAME=rar-2.0x
 
 .if ${MACHINE_ARCH} == "i386"
 DISTFILES=	rarbsd.sfx
-PKGNAME=	rar-2.02
+PKGNAME=	rar-2.02p0
 EMUL=		bsdos
 .elif ${MACHINE_ARCH} == "sparc"
 DISTFILES=	rarsparc.sfx
-PKGNAME=	rar-2.01
+PKGNAME=	rar-2.01p0
 EMUL=		svr4
 .else
 DISTFILES=
diff --git a/archivers/rar/pkg/MESSAGE b/archivers/rar/pkg/MESSAGE
index e402e4d62f7..0c023bdcf96 100644
--- a/archivers/rar/pkg/MESSAGE
+++ b/archivers/rar/pkg/MESSAGE
@@ -2,4 +2,3 @@ Rar is shareware, You are required to register after 40 days of use.
 
 This package requires the sysctl kern.emul.${EMUL} being set to 1 and
 just did so. To make this change permanent, edit /etc/sysctl.conf.
-
diff --git a/benchmarks/xengine/Makefile b/benchmarks/xengine/Makefile
index 2cc60ed1570..88a0ebf7a2e 100644
--- a/benchmarks/xengine/Makefile
+++ b/benchmarks/xengine/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.27 2009/08/10 06:30:30 kili Exp $
+# $OpenBSD: Makefile,v 1.28 2010/04/15 14:58:25 ajacoutot Exp $
 
 COMMENT=	reciprocating engine for X11
-PKGNAME=	xengine-1.0.1p1
+PKGNAME=	xengine-1.0.1p2
 CATEGORIES=	benchmarks x11
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/comp.sources.x/volume09/xengine/
 DISTFILES=	part01.z patch1.z
diff --git a/benchmarks/xengine/pkg/MESSAGE b/benchmarks/xengine/pkg/MESSAGE
index bee3529a770..11fa5b9158d 100644
--- a/benchmarks/xengine/pkg/MESSAGE
+++ b/benchmarks/xengine/pkg/MESSAGE
@@ -1,3 +1,2 @@
-
 Example value:
    1067 RPMs with P100, Winner 2000PRO/X, resolution: 1152x900
diff --git a/databases/sharedance/Makefile b/databases/sharedance/Makefile
index b9a95ea022b..6cc07426d90 100644
--- a/databases/sharedance/Makefile
+++ b/databases/sharedance/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/09/17 14:27:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	high-performance server that centralizes key/data pairs
 
 DISTNAME=	sharedance-0.6
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	databases
 
 HOMEPAGE=	http://sharedance.pureftpd.org/project/sharedance
diff --git a/databases/sharedance/pkg/MESSAGE b/databases/sharedance/pkg/MESSAGE
index cf1b0677108..805757f1214 100644
--- a/databases/sharedance/pkg/MESSAGE
+++ b/databases/sharedance/pkg/MESSAGE
@@ -3,4 +3,3 @@ ${PREFIX}/share/doc/sharedance/README
 
 There are example PHP scripts that demonstrate sharedance's use
 installed at: ${PREFIX}/share/examples/sharedance/
-
diff --git a/editors/openoffice3/Makefile b/editors/openoffice3/Makefile
index c753bef2008..f61a1fd79ab 100644
--- a/editors/openoffice3/Makefile
+++ b/editors/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2010/04/12 18:45:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.41 2010/04/15 14:58:25 ajacoutot Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -10,7 +10,7 @@ VERSION=	3.2.0
 DISTNAME=	OOo_${VERSION}
 WRKDIST=	${WRKDIR}/OOO320_m12
 PKGNAME=	openoffice-${VERSION}p0
-PKGNAME-main=	openoffice-${VERSION}p0
+PKGNAME-main=	openoffice-${VERSION}p1
 PKGNAME-kde=	openoffice-kde-${VERSION}p0
 PKGNAME-java=	openoffice-java-${VERSION}p1
 CATEGORIES=	editors productivity
diff --git a/editors/openoffice3/pkg/MESSAGE-main b/editors/openoffice3/pkg/MESSAGE-main
index ce60ee14a1e..1371bc2e93a 100644
--- a/editors/openoffice3/pkg/MESSAGE-main
+++ b/editors/openoffice3/pkg/MESSAGE-main
@@ -1,4 +1,3 @@
-
 To start OpenOffice run '/usr/local/bin/soffice'
 
 Platform dependent extensions have been installed in
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 5e8d8077f2c..e62de0fdf9b 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/16 00:27:05 merdely Exp $
+# $OpenBSD: Makefile,v 1.17 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=compile Java source into .class files (quickly!)
 
 # Jikes, a fast Java compiler. 
 
 DISTNAME=	jikes-1.22
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 CATEGORIES=	lang
 HOMEPAGE=	http://jikes.sourceforge.net/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jikes/}
diff --git a/lang/jikes/pkg/MESSAGE b/lang/jikes/pkg/MESSAGE
index dcb60d38050..ba24357e175 100644
--- a/lang/jikes/pkg/MESSAGE
+++ b/lang/jikes/pkg/MESSAGE
@@ -1,4 +1,3 @@
-
 This software is subject to the terms of the IBM Jikes Compiler Open
 Source License Agreement in ${PREFIX}/share/doc/jikes/license.htm, 
 also available at this URL:
@@ -8,4 +7,3 @@ Copyright (C) 1996, 1998, International Business Machines Corporation
 and others.  All Rights Reserved.
 
 You must accept the terms of that agreement to use this software.
-
diff --git a/lang/python/2.5/Makefile b/lang/python/2.5/Makefile
index 304d53b36f5..9501d415cd4 100644
--- a/lang/python/2.5/Makefile
+++ b/lang/python/2.5/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.36 2010/04/15 14:11:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2010/04/15 14:58:24 ajacoutot Exp $
 
 VERSION=		2.5
 PATCHLEVEL=		.4
-PKG_PATCHLEVEL=		p4
+PKG_PATCHLEVEL=		p5
 SHARED_LIBS=		python2.5 1.0
 
 .if ${MACHINE_ARCH} == "mips64"
diff --git a/lang/python/2.5/pkg/MESSAGE-tools b/lang/python/2.5/pkg/MESSAGE-tools
index 520ec9d4d9a..753ef804796 100644
--- a/lang/python/2.5/pkg/MESSAGE-tools
+++ b/lang/python/2.5/pkg/MESSAGE-tools
@@ -3,4 +3,3 @@ You may wish to add the following to your .emacs:
 (autoload 'python-mode "python-mode" "Python Mode." t)
 (add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode))
 (add-to-list 'interpreter-mode-alist '("python" . python-mode))
-
diff --git a/lang/python/2.6/Makefile b/lang/python/2.6/Makefile
index 0161b9a37df..ba6ee89f7df 100644
--- a/lang/python/2.6/Makefile
+++ b/lang/python/2.6/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2010/04/15 14:11:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/04/15 14:58:24 ajacoutot Exp $
 
 VERSION=		2.6
 PATCHLEVEL=		.3
-PKG_PATCHLEVEL=		p2
+PKG_PATCHLEVEL=		p3
 SHARED_LIBS=		python2.6 1.0
 
 # PSUBDIR=		python/${VERSION}
diff --git a/lang/python/2.6/pkg/MESSAGE-tools b/lang/python/2.6/pkg/MESSAGE-tools
index 520ec9d4d9a..753ef804796 100644
--- a/lang/python/2.6/pkg/MESSAGE-tools
+++ b/lang/python/2.6/pkg/MESSAGE-tools
@@ -3,4 +3,3 @@ You may wish to add the following to your .emacs:
 (autoload 'python-mode "python-mode" "Python Mode." t)
 (add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode))
 (add-to-list 'interpreter-mode-alist '("python" . python-mode))
-
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index d0ea64e3266..ef247010cea 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2009/03/16 11:40:24 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=		anti-spam SMTP server
 DISTNAME=		avenger-0.7.4
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		mail
 
 HOMEPAGE=		http://www.mailavenger.org/
diff --git a/mail/avenger/pkg/MESSAGE b/mail/avenger/pkg/MESSAGE
index ab666c1ffeb..e47a6d54d12 100644
--- a/mail/avenger/pkg/MESSAGE
+++ b/mail/avenger/pkg/MESSAGE
@@ -1,4 +1,3 @@
-
 You must configure Mail Avenger before running it:
 
   - Edit the ${SYSCONFDIR}/avenger/asmtpd.conf file for your system.
@@ -7,4 +6,3 @@ You must configure Mail Avenger before running it:
 
   - See ${SYSCONFDIR}/avenger/smtp-filter if you want Mail Avenger to take
     advantage of OpenBSD's pf packet filter.
-
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index b04ed33247a..44bd35acb08 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.31 2009/06/01 12:15:57 jakob Exp $
+# $OpenBSD: Makefile,v 1.32 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	DKIM milter
 
 DISTNAME=	dkim-milter-2.8.3
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	mail
 HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
 
diff --git a/mail/dkim-milter/pkg/MESSAGE b/mail/dkim-milter/pkg/MESSAGE
index d3d3a9111bb..779b9dda31f 100644
--- a/mail/dkim-milter/pkg/MESSAGE
+++ b/mail/dkim-milter/pkg/MESSAGE
@@ -80,4 +80,3 @@
     connections from MTAs in order to process messages.  See the
     documentation in libmilter (available with the open source sendmail
     source code) for details on selecting and specifying a socket.
-
diff --git a/misc/xcdroast/Makefile b/misc/xcdroast/Makefile
index 6b8a14655b0..12c2af2c0e6 100644
--- a/misc/xcdroast/Makefile
+++ b/misc/xcdroast/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.24 2009/08/18 23:58:56 jolan Exp $
+# $OpenBSD: Makefile,v 1.25 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=		gtk-based frontend to cdrtools
 DISTNAME=		xcdroast-0.98alpha16
-PKGNAME=		${DISTNAME:L:S/alpha/a/}
+PKGNAME=		${DISTNAME:L:S/alpha/a/}p0
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xcdroast/}
 
diff --git a/misc/xcdroast/pkg/MESSAGE b/misc/xcdroast/pkg/MESSAGE
index 44f9a1ad5ec..2239cc2983b 100644
--- a/misc/xcdroast/pkg/MESSAGE
+++ b/misc/xcdroast/pkg/MESSAGE
@@ -1,4 +1,3 @@
-
 Notes on Preparing X-CD-Roast for Operation
 -------------------------------------------
 Due to cdrecord's -scanbus option being wholly unusable under
@@ -18,4 +17,3 @@ with the correct options.  If you wish to enable CD burning for
 non-root users, click the "Activate Non-Root-Mode" button.  You will be
 presented with the list of commands that are to be executed and
 have the opportunity to cancel.
-
diff --git a/net/ipfreely/Makefile b/net/ipfreely/Makefile
index f1d37b6ef61..4911db41273 100644
--- a/net/ipfreely/Makefile
+++ b/net/ipfreely/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/15 22:36:54 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=		simple, secure TCP proxy daemon
 
 DISTNAME=		ipfreely-20050327
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		net
 
 HOMEPAGE=		http://ipfreely.sourceforge.net/
diff --git a/net/ipfreely/pkg/MESSAGE b/net/ipfreely/pkg/MESSAGE
index 3e4098dd725..b1bfb1112ff 100644
--- a/net/ipfreely/pkg/MESSAGE
+++ b/net/ipfreely/pkg/MESSAGE
@@ -9,4 +9,3 @@ if [ -x ${PREFIX}/sbin/ipfreely ]; then
         -u _ipfreely \
         -c /var/empty/
 fi
-
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index a0ab68e39dd..889993347a5 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2010/04/09 16:22:00 martin Exp $
+# $OpenBSD: Makefile,v 1.7 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	OLSR routing daemon
 
 DISTNAME=	olsrd-0.5.6-r8
-PKGNAME=	${DISTNAME:S/-r/r/}
+PKGNAME=	${DISTNAME:S/-r/r/}p0
 CATEGORIES=     net
 
 HOMEPAGE=	http://www.olsr.org/
diff --git a/net/olsrd/pkg/MESSAGE b/net/olsrd/pkg/MESSAGE
index 089910ef3f7..da509693839 100644
--- a/net/olsrd/pkg/MESSAGE
+++ b/net/olsrd/pkg/MESSAGE
@@ -4,4 +4,3 @@ add the following lines to /etc/rc.local:
 if [ -x ${PREFIX}/sbin/olsrd ]; then
         echo -n ' olsrd';       ${PREFIX}/sbin/olsrd
 fi
-
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index ad166b9480b..7e6069abf7c 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.47 2010/03/27 08:14:36 chl Exp $
+# $OpenBSD: Makefile,v 1.48 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	small, easy to set up, fast and very secure FTP server
 
 DISTNAME=	pure-ftpd-1.0.29
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
diff --git a/net/pure-ftpd/pkg/MESSAGE b/net/pure-ftpd/pkg/MESSAGE
index 06824a9db39..90a3029db78 100644
--- a/net/pure-ftpd/pkg/MESSAGE
+++ b/net/pure-ftpd/pkg/MESSAGE
@@ -5,4 +5,3 @@ if [ -x ${PREFIX}/sbin/pure-ftpd ]; then
   echo Starting Pure-FTPd
   ${PREFIX}/sbin/pure-ftpd -A -B -H -u1000
 fi
-
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 40fb615366a..74183c7c5e1 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.54 2009/08/16 13:31:27 rui Exp $
+# $OpenBSD: Makefile,v 1.55 2010/04/15 14:58:24 ajacoutot Exp $
 
 SHARED_ONLY = 		Yes
 
 COMMENT =		highly flexible sniffer/NIDS
 
 DISTNAME = 		snort-2.8.4.1
+PKGNAME =		${DISTNAME}p0
 CATEGORIES =		net security
 MASTER_SITES = 		http://dl.snort.org/snort-current/
 
diff --git a/net/snort/pkg/MESSAGE b/net/snort/pkg/MESSAGE
index f0ce4e94666..3363b906a9b 100644
--- a/net/snort/pkg/MESSAGE
+++ b/net/snort/pkg/MESSAGE
@@ -8,4 +8,3 @@ purpose. You should start snort with the following options to take
 advantage of this:
 
   -c /etc/snort/snort.conf -u _snort -g _snort -t /var/snort -l /var/snort/log
-
diff --git a/net/snort/pkg/MESSAGE-prelude b/net/snort/pkg/MESSAGE-prelude
index 4c8f5a91fe0..bf6cf59dedc 100644
--- a/net/snort/pkg/MESSAGE-prelude
+++ b/net/snort/pkg/MESSAGE-prelude
@@ -20,4 +20,3 @@ example).
 Eventually, you should start snort with the following options:
 
     -c /etc/snort/snort.conf -u _snort -g _snort -l /var/snort/log
-
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index f5298ecbe25..6bf2d5c5bcb 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2007/09/15 22:37:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.13 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	lightweight userspace bandwidth shaper
 DISTNAME=	trickle-1.06
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p4
 CATEGORIES=	net
 HOMEPAGE=	"http://monkey.org/~marius/pages/?page=trickle"
 MASTER_SITES=	http://monkey.org/~marius/trickle/
diff --git a/net/trickle/pkg/MESSAGE b/net/trickle/pkg/MESSAGE
index e207b207a18..78e33ef494b 100644
--- a/net/trickle/pkg/MESSAGE
+++ b/net/trickle/pkg/MESSAGE
@@ -1,4 +1,3 @@
-
 Post Installation Set-Up of trickle
 -----------------------------------
 
@@ -13,4 +12,3 @@ with, but does not require root privileges):
 if [ -x ${PREFIX}/bin/trickled ]; then
         echo -n ' trickled';     ${PREFIX}/bin/trickled
 fi
-
diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile
index 65a93e8725c..c0ed7901c60 100644
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2008/01/04 17:48:37 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	client and servers for the WIDE DHCP protocol
 
 DISTNAME=       dhcp-1.4.0p3
-PKGNAME=        wide-dhcp-1.4.0.3
+PKGNAME=        wide-dhcp-1.4.0.3p0
 CATEGORIES=     net
 MASTER_SITES=   ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/
 
diff --git a/net/wide-dhcp/pkg/MESSAGE b/net/wide-dhcp/pkg/MESSAGE
index 80adbe0c56c..59aa208db2f 100644
--- a/net/wide-dhcp/pkg/MESSAGE
+++ b/net/wide-dhcp/pkg/MESSAGE
@@ -9,4 +9,3 @@ Also, ensure that BPF support is compiled into the kernel.
 Examples and documentation are in:
  ${PREFIX}/share/doc/wide-dhcp , and
  ${PREFIX}/share/examples/wide-dhcp
-
diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index a8a5dbe7980..62a6802e3d0 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.28 2007/09/15 23:29:58 merdely Exp $
+# $OpenBSD: Makefile,v 1.29 2010/04/15 14:58:24 ajacoutot Exp $
 
 NOT_FOR_ARCHS=	${LP64_ARCHS}
 
 COMMENT=	cryptographic file system (user-space NFS server)
 
 DISTNAME=	cfs-1.4.1
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	security
 
 HOMEPAGE=	http://www.crypto.com/software/
diff --git a/security/cfs/pkg/MESSAGE b/security/cfs/pkg/MESSAGE
index 87863c5117a..8678a89d0a1 100644
--- a/security/cfs/pkg/MESSAGE
+++ b/security/cfs/pkg/MESSAGE
@@ -17,4 +17,3 @@ Then do these steps as root:
 
    1) set "nfs_server=YES" and "portmap=YES" in /etc/rc.conf.local
    2) reboot or start all necessary daemons by hand and mount /crypt
-
diff --git a/security/prelude/libpreludedb/Makefile b/security/prelude/libpreludedb/Makefile
index e18cfbf86d8..1506d7ec29c 100644
--- a/security/prelude/libpreludedb/Makefile
+++ b/security/prelude/libpreludedb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2009/10/27 13:12:48 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT-main=	Prelude framework database-access library
 COMMENT-pgsql=	PostgreSQL module for libpreludedb
@@ -8,7 +8,7 @@ COMMENT-sqlite=	SQLite3 module for libpreludedb
 VERSION=	0.9.15.3
 DISTNAME=	libpreludedb-${VERSION}
 
-PKGNAME-main=	prelude-libpreludedb-${VERSION}p0
+PKGNAME-main=	prelude-libpreludedb-${VERSION}p1
 PKGNAME-pgsql=	prelude-libpreludedb-pgsql-${VERSION}p0
 PKGNAME-mysql=	prelude-libpreludedb-mysql-${VERSION}p0
 PKGNAME-sqlite=	prelude-libpreludedb-sqlite-${VERSION}p0
diff --git a/security/prelude/libpreludedb/pkg/MESSAGE-main b/security/prelude/libpreludedb/pkg/MESSAGE-main
index f12c67d2083..7682794f215 100644
--- a/security/prelude/libpreludedb/pkg/MESSAGE-main
+++ b/security/prelude/libpreludedb/pkg/MESSAGE-main
@@ -1,3 +1,2 @@
 You should read ${PREFIX}/share/doc/libpreludedb/README.OpenBSD for more
 details about libpreludedb settings.
-
diff --git a/security/prelude/lml/Makefile b/security/prelude/lml/Makefile
index 0584d82f51a..c26bde8ff58 100644
--- a/security/prelude/lml/Makefile
+++ b/security/prelude/lml/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2009/08/30 20:37:16 rui Exp $
+# $OpenBSD: Makefile,v 1.16 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	Prelude log analyzer
 
 DISTNAME=	prelude-lml-0.9.15
+PKGNAME=	${DISTNAME}p0
 
 WANTLIB=	c gcrypt gnutls gpg-error m tasn1 z
 MODULES=	devel/gettext
diff --git a/security/prelude/lml/pkg/MESSAGE b/security/prelude/lml/pkg/MESSAGE
index f0b18780847..107ee26e837 100644
--- a/security/prelude/lml/pkg/MESSAGE
+++ b/security/prelude/lml/pkg/MESSAGE
@@ -1,3 +1,2 @@
 You should read ${PREFIX}/share/doc/prelude-lml/README.OpenBSD for more
 details about prelude-lml settings.
-
diff --git a/security/prelude/pflogger/Makefile b/security/prelude/pflogger/Makefile
index ba2cfd6a0a5..b4b2e1e08c5 100644
--- a/security/prelude/pflogger/Makefile
+++ b/security/prelude/pflogger/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2009/08/30 20:37:16 rui Exp $
+# $OpenBSD: Makefile,v 1.9 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	Prelude sensors for Packet Filter
 
 DISTNAME=	prelude-pflogger-0.9.0-rc2
-PKGNAME=	prelude-pflogger-0.9.0rc2p4
+PKGNAME=	prelude-pflogger-0.9.0rc2p5
 
 MASTER_SITES=	http://www.prelude-ids.com/download/releases/prelude-pflogger/
 
diff --git a/security/prelude/pflogger/pkg/MESSAGE b/security/prelude/pflogger/pkg/MESSAGE
index 58575716835..c9674cb878e 100644
--- a/security/prelude/pflogger/pkg/MESSAGE
+++ b/security/prelude/pflogger/pkg/MESSAGE
@@ -1,3 +1,2 @@
 You should read ${PREFIX}/share/doc/pflogger/README.OpenBSD for more
 details about pflogger settings.
-
diff --git a/security/prelude/prewikka/Makefile b/security/prelude/prewikka/Makefile
index 30cd0853845..fdcfd86b0a6 100644
--- a/security/prelude/prewikka/Makefile
+++ b/security/prelude/prewikka/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2009/08/30 20:37:16 rui Exp $
+# $OpenBSD: Makefile,v 1.18 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	Prelude Management Console
 
 MODPY_EGG_VERSION=0.9.17
 DISTNAME=	prewikka-0.9.17
-PKGNAME=	prelude-${DISTNAME}
+PKGNAME=	prelude-${DISTNAME}p0
 
 MODULES=	lang/python
 
diff --git a/security/prelude/prewikka/pkg/MESSAGE b/security/prelude/prewikka/pkg/MESSAGE
index 7c2006ddfd5..54be2f49985 100644
--- a/security/prelude/prewikka/pkg/MESSAGE
+++ b/security/prelude/prewikka/pkg/MESSAGE
@@ -1,3 +1,2 @@
 You should read ${PREFIX}/share/doc/prewikka/README.OpenBSD for more
 details about prewikka settings.
-
diff --git a/telephony/pjsua/Makefile b/telephony/pjsua/Makefile
index 7ce29b6d179..883c732b945 100644
--- a/telephony/pjsua/Makefile
+++ b/telephony/pjsua/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2010/04/02 11:48:24 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.6 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=		lightweight sip client
 
 VERSION=		1.5.5
 DISTNAME=		pjproject-${VERSION}
-PKGNAME=		pjsua-${VERSION}
+PKGNAME=		pjsua-${VERSION}p0
 EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		telephony
 
diff --git a/telephony/pjsua/pkg/MESSAGE b/telephony/pjsua/pkg/MESSAGE
index 75fbd6cd120..6432fba76dc 100644
--- a/telephony/pjsua/pkg/MESSAGE
+++ b/telephony/pjsua/pkg/MESSAGE
@@ -10,4 +10,3 @@
 
 For more documentation, see:
 	http://www.pjsip.org/pjsua.htm
-
diff --git a/textproc/swish-e/Makefile b/textproc/swish-e/Makefile
index 65704b66751..fabee30547f 100644
--- a/textproc/swish-e/Makefile
+++ b/textproc/swish-e/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/09/11 20:52:49 merdely Exp $
+# $OpenBSD: Makefile,v 1.2 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=		web/text search engine
 
 DISTNAME=		swish-e-2.4.5
+PKGNAME=		${DISTNAME}p0
 SHARED_LIBS=		swish-e	2.0
 CATEGORIES=		textproc www
 
diff --git a/textproc/swish-e/pkg/MESSAGE b/textproc/swish-e/pkg/MESSAGE
index 1a19de9f338..17f75454844 100644
--- a/textproc/swish-e/pkg/MESSAGE
+++ b/textproc/swish-e/pkg/MESSAGE
@@ -5,4 +5,3 @@ Additional indexing functionality:
 * For MS Word Documents, install catdoc package.
 * For MP3 ID3 Tags, install p5-MP3-Tag package.
 * For MS Excel Files, install p5-Spreadsheet-ParseExcel package.
-
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 5a6247aa040..d7303fb6a82 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2009/10/10 17:09:03 steven Exp $
+# $OpenBSD: Makefile,v 1.10 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	high-level Python web framework
 
 MODPY_EGG_VERSION=	1.1.1
 LNAME=			django
 DISTNAME=		Django-${MODPY_EGG_VERSION}
-PKGNAME=		py-${LNAME}-${MODPY_EGG_VERSION}
+PKGNAME=		py-${LNAME}-${MODPY_EGG_VERSION}p0
 CATEGORIES=		www
 
 HOMEPAGE=	http://www.djangoproject.com/
diff --git a/www/py-django/pkg/MESSAGE b/www/py-django/pkg/MESSAGE
index ce0ff8e1f14..184fdf5ff74 100644
--- a/www/py-django/pkg/MESSAGE
+++ b/www/py-django/pkg/MESSAGE
@@ -17,4 +17,3 @@ version 0.96 and 1.0 that may cause problems when upgrading
 projects.  A guide for upgrading projects can be found
 online at:
 http://docs.djangoproject.com/en/1.0/releases/1.0-porting-guide/
-
diff --git a/www/squid/Makefile b/www/squid/Makefile
index a1c0fd394c9..876614884a5 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.101 2010/02/03 06:41:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.102 2010/04/15 14:58:24 ajacoutot Exp $
 
 COMMENT=	WWW and FTP proxy cache and accelerator
 
 DISTNAME=	squid-2.7.STABLE7
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}/Versions/v2/2.7/
 DIST_SUBDIR=	squid
diff --git a/www/squid/pkg/MESSAGE b/www/squid/pkg/MESSAGE
index f5e898ec014..5692464f59f 100644
--- a/www/squid/pkg/MESSAGE
+++ b/www/squid/pkg/MESSAGE
@@ -19,4 +19,3 @@ You can also edit /etc/rc.local so that Squid is started automatically:
     if [ -x ${PREFIX}/sbin/squid ]; then
 	echo -n ' squid';	${PREFIX}/sbin/squid
     fi
-
diff --git a/www/zendframework/Makefile b/www/zendframework/Makefile
index 2e3c64c1a2e..eaaa714acd2 100644
--- a/www/zendframework/Makefile
+++ b/www/zendframework/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2009/10/15 11:01:01 robert Exp $
+# $OpenBSD: Makefile,v 1.4 2010/04/15 14:58:25 ajacoutot Exp $
 
 COMMENT=		a framework for developing PHP web applications
 
 V=			1.9.4
 DISTNAME=		zendframework-${V}
+PKGNAME=		${DISTNAME}p0
 DISTFILES=		ZendFramework-${V}.tar.gz
 
 CATEGORIES=		www devel
diff --git a/www/zendframework/pkg/MESSAGE b/www/zendframework/pkg/MESSAGE
index eff4fed0b67..977f5ddb39d 100644
--- a/www/zendframework/pkg/MESSAGE
+++ b/www/zendframework/pkg/MESSAGE
@@ -3,4 +3,3 @@ The ZendFramework has been installed into ${INSTDIR}
 You should add this to your include_path in php.ini:
 
 include_path = ".:/pear/lib:/var/www/pear/lib:${INSTDIR}"
-
diff --git a/x11/jmk-fonts/Makefile b/x11/jmk-fonts/Makefile
index fca8013b141..0e99a57df22 100644
--- a/x11/jmk-fonts/Makefile
+++ b/x11/jmk-fonts/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2007/08/04 20:43:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2010/04/15 14:58:25 ajacoutot Exp $
 
 COMMENT=		nice fixed width fonts, easy on the eye
 
 V=			3.0
 DISTNAME=		jmk-x11-fonts-${V}
-PKGNAME=		jmk-fonts-${V}p0
+PKGNAME=		jmk-fonts-${V}p1
 CATEGORIES=		x11
 
 HOMEPAGE=		http://www.jmknoble.net/fonts/
diff --git a/x11/jmk-fonts/pkg/MESSAGE b/x11/jmk-fonts/pkg/MESSAGE
index 29d23f01ef0..f7c57d79f70 100644
--- a/x11/jmk-fonts/pkg/MESSAGE
+++ b/x11/jmk-fonts/pkg/MESSAGE
@@ -1,4 +1,3 @@
-
 Be sure to add ${PREFIX}/lib/X11/fonts/jmk to your fontpath,
 preferably in your xorg.conf by adding this line:
 
@@ -8,4 +7,3 @@ Or, if you wish, from your shell:
 
 	$ xset fp+ ${PREFIX}/lib/X11/fonts/jmk
 	$ xset fp rehash
-