diff --git a/graphics/Makefile b/graphics/Makefile
index 59724c14b44..ce2d8c7e527 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.88 2002/01/23 04:06:14 kevlo Exp $
+# $OpenBSD: Makefile,v 1.89 2002/01/25 23:11:06 jsyn Exp $
 # $FreeBSD: Makefile,v 1.55 1997/11/03 12:12:27 tg Exp $
 #
 
@@ -13,8 +13,8 @@
      SUBDIR += cqcam
 #    SUBDIR += dc3play
      SUBDIR += dia
-     SUBDIR += dumpmpeg
 #    SUBDIR += dore
+     SUBDIR += dumpmpeg
      SUBDIR += enjoympeg
      SUBDIR += flash
      SUBDIR += fnlib
@@ -28,10 +28,10 @@
      SUBDIR += ggi
      SUBDIR += gif2png
 #    SUBDIR += gifmerge
-#    SUBDIR += giftool
-     SUBDIR += giftrans
      SUBDIR += gifsicle
      SUBDIR += gifsicle,no_x11
+#    SUBDIR += giftool
+     SUBDIR += giftrans
      SUBDIR += gii
      SUBDIR += gimp
      SUBDIR += gkrellkam
@@ -39,8 +39,8 @@
      SUBDIR += glut
      SUBDIR += gphoto
      SUBDIR += gqview
-     SUBDIR += gtksee
      SUBDIR += gracula
+     SUBDIR += gtksee
 #    SUBDIR += hdf
 #    SUBDIR += hobbes-icons-xpm
 #    SUBDIR += hpscan
@@ -66,7 +66,6 @@
      SUBDIR += mplex
      SUBDIR += mtv
      SUBDIR += netpbm
-     SUBDIR += p5-Imager
      SUBDIR += p5-GD
      SUBDIR += p5-GD,no_x11
      SUBDIR += p5-GD-Graph
@@ -75,6 +74,7 @@
      SUBDIR += p5-Graphics-ColorNames
      SUBDIR += p5-Image-Info
      SUBDIR += p5-Image-Size
+     SUBDIR += p5-Imager
 #    SUBDIR += pgperl
 #    SUBDIR += pgplot
 #    SUBDIR += photopc
diff --git a/japanese/Makefile b/japanese/Makefile
index 0eb9c814636..66e16f1bcf6 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -1,26 +1,26 @@
-# $OpenBSD: Makefile,v 1.14 2001/03/28 15:23:09 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2002/01/25 23:11:06 jsyn Exp $
 
      SUBDIR += Wnn
      SUBDIR += canna
+     SUBDIR += funetfonts
+     SUBDIR += groff
+     SUBDIR += intlfonts
+     SUBDIR += jvim
+     SUBDIR += jvim,canna
+     SUBDIR += jvim,wnn
+     SUBDIR += jvim,wnn,canna
+     SUBDIR += kakasi
+     SUBDIR += kanjips
      SUBDIR += kbanner
      SUBDIR += kinput2,wnn
      SUBDIR += kinput2,canna
      SUBDIR += kinput2,canna,wnn
-     SUBDIR += onew,wnn4
-     SUBDIR += onew,canna
-     SUBDIR += onew,wnn4,canna
-     SUBDIR += kakasi
-     SUBDIR += intlfonts
-     SUBDIR += funetfonts
-     SUBDIR += groff
-     SUBDIR += jvim
-     SUBDIR += jvim,wnn
-     SUBDIR += jvim,canna
-     SUBDIR += jvim,wnn,canna
-     SUBDIR += kanjips
      SUBDIR += kterm
      SUBDIR += kterm,xaw3d
      SUBDIR += less
      SUBDIR += nkf
+     SUBDIR += onew,canna
+     SUBDIR += onew,wnn4
+     SUBDIR += onew,wnn4,canna
 
 .include <bsd.port.subdir.mk>
diff --git a/lang/Makefile b/lang/Makefile
index 509eb4353ef..cb6faaa05d3 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2001/10/24 12:22:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.46 2002/01/25 23:11:06 jsyn Exp $
 # $FreeBSD: Makefile,v 1.89 1997/11/24 09:24:06 tg Exp $
 #
 
@@ -56,17 +56,17 @@
 #    SUBDIR += pgcc
 #    SUBDIR += pgcc-current
      SUBDIR += pm3
-     SUBDIR += python,
+     SUBDIR += python
      SUBDIR += python,threads
-     SUBDIR += python,tk,threads,no_tools
      SUBDIR += python,tk,no_tools
+     SUBDIR += python,tk,threads,no_tools
 #    SUBDIR += rexx-imc
      SUBDIR += ruby
+     SUBDIR += scheme-report
 #    SUBDIR += scheme48
 #    SUBDIR += schemetoc
      SUBDIR += scm
      SUBDIR += scm,no_x11
-     SUBDIR += scheme-report
 #    SUBDIR += smalltalk
      SUBDIR += squeak
 #    SUBDIR += sr