sort, and use consistent whitespace

audio/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.353 2015/05/06 08:19:39 jasper Exp $
+# $OpenBSD: Makefile,v 1.354 2015/06/10 20:01:03 sthen Exp $
 
      SUBDIR =
      SUBDIR += abcde
@@ -41,8 +41,8 @@
      SUBDIR += exaile
      SUBDIR += faac
      SUBDIR += faad
-     SUBDIR += festival
      SUBDIR += fdk-aac
+     SUBDIR += festival
      SUBDIR += flac
      SUBDIR += flac123
      SUBDIR += flite
@@ -174,9 +174,9 @@
      SUBDIR += p5-gnupod
      SUBDIR += p5-libvorbis
      SUBDIR += pacpl
+     SUBDIR += paulstretch
      SUBDIR += pavucontrol
      SUBDIR += pavucontrol,gtk3
-     SUBDIR += paulstretch
      SUBDIR += pianobar
      SUBDIR += picard
      SUBDIR += pithos

books/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2015/05/02 18:17:34 landry Exp $
+# $OpenBSD: Makefile,v 1.23 2015/06/10 20:01:03 sthen Exp $
 
      SUBDIR =
      SUBDIR += AsteriskGuide
@@ -16,8 +16,8 @@
      SUBDIR += man-pages-posix
      SUBDIR += mason-book
      SUBDIR += svnbook
-     SUBDIR += thinking-forth
      SUBDIR += tex-by-topic
+     SUBDIR += thinking-forth
      SUBDIR += vol3ol
      SUBDIR += vol6a
      SUBDIR += wndw

devel/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1351 2015/06/08 11:07:18 czarkoff Exp $
+# $OpenBSD: Makefile,v 1.1352 2015/06/10 20:01:03 sthen Exp $
 
      SUBDIR =
      SUBDIR += ElectricFence
@@ -144,8 +144,8 @@
      SUBDIR += gmake
      SUBDIR += gmc4cc
      SUBDIR += gmp
-     SUBDIR += gobject-introspection
      SUBDIR += go-tools
+     SUBDIR += gobject-introspection
      SUBDIR += goffice
      SUBDIR += goffice08
      SUBDIR += goopy
@@ -647,8 +647,8 @@
      SUBDIR += p5-Data-Stag
      SUBDIR += p5-Data-Structure-Util
      SUBDIR += p5-Data-Types
-     SUBDIR += p5-Data-Uniqid
      SUBDIR += p5-Data-UUID
+     SUBDIR += p5-Data-Uniqid
      SUBDIR += p5-Data-VString
      SUBDIR += p5-Data-Validate
      SUBDIR += p5-Data-Validate-IP
@@ -863,6 +863,7 @@
      SUBDIR += p5-Module-Versions-Report
      SUBDIR += p5-Module-Which
      SUBDIR += p5-Moo
+     SUBDIR += p5-MooX-Types-MooseLike
      SUBDIR += p5-Moose
      SUBDIR += p5-MooseX-Aliases
      SUBDIR += p5-MooseX-AttributeHelpers
@@ -895,7 +896,6 @@
      SUBDIR += p5-MooseX-Types-LoadableClass
      SUBDIR += p5-MooseX-Types-Path-Class
      SUBDIR += p5-MooseX-Types-Structured
-     SUBDIR += p5-MooX-Types-MooseLike
      SUBDIR += p5-Mouse
      SUBDIR += p5-MouseX-Types
      SUBDIR += p5-Net-Server
@@ -919,6 +919,7 @@
      SUBDIR += p5-POE-Loop-Tk
      SUBDIR += p5-POE-Test-Loops
      SUBDIR += p5-POE-XS-Queue-Array
+     SUBDIR += p5-POSIX-strftime-Compiler
      SUBDIR += p5-Package-DeprecationManager
      SUBDIR += p5-Package-Generator
      SUBDIR += p5-Package-Stash
@@ -945,13 +946,12 @@
      SUBDIR += p5-Perl6-Junction
      SUBDIR += p5-PerlIO-eol
      SUBDIR += p5-PerlIO-via-Bzip2
+     SUBDIR += p5-PerlIO-via-Timeout
      SUBDIR += p5-PerlIO-via-dynamic
      SUBDIR += p5-PerlIO-via-symlink
-     SUBDIR += p5-PerlIO-via-Timeout
      SUBDIR += p5-Pod-Constant
      SUBDIR += p5-Pod-Coverage
      SUBDIR += p5-Pod-ToDemo
-     SUBDIR += p5-POSIX-strftime-Compiler
      SUBDIR += p5-Probe-Perl
      SUBDIR += p5-Proc-Background
      SUBDIR += p5-Proc-Daemon
@@ -1030,12 +1030,12 @@
      SUBDIR += p5-Term-Size
      SUBDIR += p5-Test-Assertions
      SUBDIR += p5-Test-Base
+     SUBDIR += p5-Test-CPAN-Meta
      SUBDIR += p5-Test-CheckManifest
      SUBDIR += p5-Test-Class
      SUBDIR += p5-Test-ClassAPI
      SUBDIR += p5-Test-Cmd
      SUBDIR += p5-Test-Corpus-Audio-MPD
-     SUBDIR += p5-Test-CPAN-Meta
      SUBDIR += p5-Test-Deep
      SUBDIR += p5-Test-Differences
      SUBDIR += p5-Test-DistManifest

inputmethods/Makefile

@@ -1,24 +1,24 @@
-# $OpenBSD: Makefile,v 1.13 2014/07/10 08:30:33 bentley Exp $
+# $OpenBSD: Makefile,v 1.14 2015/06/10 20:01:03 sthen Exp $
-
-SUBDIR =
-SUBDIR += anthy
-SUBDIR += cellwriter
-SUBDIR += ibus
-SUBDIR += ibus-anthy
-SUBDIR += ibus-skk
-SUBDIR += libskk
-SUBDIR += libtomoe-gtk
-SUBDIR += scim
-SUBDIR += scim-anthy
-SUBDIR += scim-chewing
-SUBDIR += scim-fcitx
-SUBDIR += scim-hangul
-SUBDIR += scim-pinyin
-SUBDIR += scim-qtimm
-SUBDIR += scim-tables
-SUBDIR += tomoe
-SUBDIR += uim
-SUBDIR += uim-chewing
-SUBDIR += uim-tomoe-gtk
 
+     SUBDIR =
+     SUBDIR += anthy
+     SUBDIR += cellwriter
+     SUBDIR += ibus
+     SUBDIR += ibus-anthy
+     SUBDIR += ibus-skk
+     SUBDIR += libskk
+     SUBDIR += libtomoe-gtk
+     SUBDIR += scim
+     SUBDIR += scim-anthy
+     SUBDIR += scim-chewing
+     SUBDIR += scim-fcitx
+     SUBDIR += scim-hangul
+     SUBDIR += scim-pinyin
+     SUBDIR += scim-qtimm
+     SUBDIR += scim-tables
+     SUBDIR += tomoe
+     SUBDIR += uim
+     SUBDIR += uim-chewing
+     SUBDIR += uim-tomoe-gtk
+     
 .include <bsd.port.subdir.mk>

japanese/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2012/09/11 15:09:11 fgsch Exp $
+# $OpenBSD: Makefile,v 1.29 2015/06/10 20:01:03 sthen Exp $
 
      SUBDIR =
      SUBDIR += Wnn
@@ -21,8 +21,8 @@
      SUBDIR += kterm
      SUBDIR += kterm,xaw3d
      SUBDIR += less
-     SUBDIR += nkf
      SUBDIR += mecab
+     SUBDIR += nkf
      SUBDIR += onew,canna
      SUBDIR += onew,wnn4
      SUBDIR += onew,wnn4,canna

lang/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.173 2015/05/20 15:05:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.174 2015/06/10 20:01:03 sthen Exp $
 
      SUBDIR =
      SUBDIR += STk
@@ -20,9 +20,9 @@
      SUBDIR += erlang
      SUBDIR += expect
      SUBDIR += feldspar
-     SUBDIR += fsharp
      SUBDIR += fpc
      SUBDIR += freehdl
+     SUBDIR += fsharp
      SUBDIR += g77
      SUBDIR += gambit
      SUBDIR += gawk

net/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.905 2015/06/08 10:32:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.906 2015/06/10 20:01:03 sthen Exp $
 
      SUBDIR =
      SUBDIR += GeoIP
@@ -436,8 +436,8 @@
      SUBDIR += p5-Test-TCP
      SUBDIR += p5-Validate-Net
      SUBDIR += p5-XML-RPC
-     SUBDIR += p5-flowd
      SUBDIR += p5-Zonemaster
+     SUBDIR += p5-flowd
      SUBDIR += packit
      SUBDIR += pavuk
      SUBDIR += pavuk,no_x11

telephony/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2014/09/25 19:32:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2015/06/10 20:01:03 sthen Exp $
 
      SUBDIR =
      SUBDIR += asterisk
@@ -15,8 +15,8 @@
      SUBDIR += kamailio
      SUBDIR += libosip2
      SUBDIR += libzrtp
-     SUBDIR += p5-Net-SIP
      SUBDIR += p5-Asterisk-AMI
+     SUBDIR += p5-Net-SIP
      SUBDIR += p5-asterisk
      SUBDIR += pjsua
      SUBDIR += siproxd

tests/Makefile

@@ -1,5 +1,7 @@
-SUBDIR =
+# $OpenBSD: Makefile,v 1.2 2015/06/10 20:01:03 sthen Exp $
-SUBDIR += portbump
+
-SUBDIR += portcheck
+     SUBDIR =
+     SUBDIR += portbump
+     SUBDIR += portcheck
 
 .include <bsd.subdir.mk>

www/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.717 2015/06/05 02:55:34 jeremy Exp $
+# $OpenBSD: Makefile,v 1.718 2015/06/10 20:01:03 sthen Exp $
 
      SUBDIR =
      SUBDIR += ajaxterm
@@ -32,8 +32,8 @@
      SUBDIR += cntlm
      SUBDIR += conkeror
      SUBDIR += cronolog
-     SUBDIR += darkhttpd
      SUBDIR += dansguardian
+     SUBDIR += darkhttpd
      SUBDIR += decss
      SUBDIR += dillo
      SUBDIR += dokuwiki
@@ -226,8 +226,8 @@
      SUBDIR += p5-Dancer2
      SUBDIR += p5-Dancer2-Plugin-Ajax
      SUBDIR += p5-Dancer2-Plugin-Auth-Tiny
-     SUBDIR += p5-Dancer2-Plugin-Database
      SUBDIR += p5-Dancer2-Plugin-DBIC
+     SUBDIR += p5-Dancer2-Plugin-Database
      SUBDIR += p5-Data-URIEncode
      SUBDIR += p5-Drupal-Admin
      SUBDIR += p5-FCGI-ProcManager
@@ -416,8 +416,8 @@
      SUBDIR += py-genshi
      SUBDIR += py-gunicorn
      SUBDIR += py-htmltmpl
-     SUBDIR += py-httplib2
      SUBDIR += py-httpie
+     SUBDIR += py-httplib2
      SUBDIR += py-itsdangerous
      SUBDIR += py-jinja2
      SUBDIR += py-jonpy