Convert all makefiles to new formats.

11 files changed, 198 insertions, 177 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index a8d9d0f8dd82..31d5b2c48451 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,10 +1,17 @@
-# $Id: Makefile,v 1.5 1995/01/24 16:58:53 ache Exp $
-#
-# RESTRICTED: hpack.non-usa_only
-# RESTRICTED: unzip.with_encryption
-# RESTRICTED: zip.with_encryption
+# $Id: Makefile,v 1.6 1995/05/14 03:28:58 asami Exp $
 #
 
-SUBDIR= arc gshar+gunshar ha lha unarj unrar unzip zip zoo
+    SUBDIR += arc
+    SUBDIR += gshar+gunshar
+    SUBDIR += ha
+RESTRICTED += hpack.non-usa_only
+    SUBDIR += lha
+    SUBDIR += unarj
+    SUBDIR += unrar
+    SUBDIR += unzip
+RESTRICTED += unzip.with_encryption
+    SUBDIR += zip
+RESTRICTED += zip.with_encryption
+    SUBDIR += zoo
 
 .include <bsd.port.subdir.mk>
diff --git a/audio/Makefile b/audio/Makefile
index b7753ef25de9..27d46ce28e18 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,22 +1,20 @@
-# $Id: Makefile,v 1.21 1995/07/03 22:28:15 torstenb Exp $
-#
-# RESTRICTED: xmcd (needs Motif, xmcd itself isn't restricted)
-#
-# BROKEN: gmod
+# $Id: Makefile,v 1.22 1995/07/12 04:19:15 asami Exp $
 #
 
-   SUBDIR += gsm
-   SUBDIR += maplay
-   SUBDIR += nas
-   SUBDIR += playmidi
-   SUBDIR += radio
-   SUBDIR += rplay
-   SUBDIR += rsynth
-   SUBDIR += s3mod
-   SUBDIR += sox
-   SUBDIR += tracker
-   SUBDIR += xcd
-   SUBDIR += xcdplayer
-   SUBDIR += xmix
+    BROKEN += gmod
+    SUBDIR += gsm
+    SUBDIR += maplay
+    SUBDIR += nas
+    SUBDIR += playmidi
+    SUBDIR += radio
+    SUBDIR += rplay
+    SUBDIR += rsynth
+    SUBDIR += s3mod
+    SUBDIR += sox
+    SUBDIR += tracker
+    SUBDIR += xcd
+    SUBDIR += xcdplayer
+RESTRICTED += xmcd       # needs Motif, xmcd itself isn't restricted
+    SUBDIR += xmix
 
 .include <bsd.port.subdir.mk>
diff --git a/editors/Makefile b/editors/Makefile
index 7f2bf2b99ab2..c5e5fcf8f166 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,6 +1,17 @@
-# $Id: Makefile,v 1.20 1995/06/22 21:33:35 joerg Exp $
+# $Id: Makefile,v 1.21 1995/10/02 16:17:08 erich Exp $
 #
 
-SUBDIR=	axe e93 emacs jove mule tkHTML uemacs uzap vile xcoral xemacs xvile
+    SUBDIR += axe
+    SUBDIR += e93
+    SUBDIR += emacs
+    SUBDIR += jove
+    SUBDIR += mule
+    SUBDIR += tkHTML
+    SUBDIR += uemacs
+    SUBDIR += uzap
+    SUBDIR += vile
+    SUBDIR += xcoral
+    SUBDIR += xemacs
+    SUBDIR += xvile
 
 .include <bsd.port.subdir.mk>
diff --git a/games/Makefile b/games/Makefile
index 76c195ce20f4..4173eda05fd3 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,39 +1,39 @@
-# $Id: Makefile,v 1.29 1995/09/12 10:31:00 asami Exp $
+# $Id: Makefile,v 1.30 1995/10/03 11:33:49 asami Exp $
 #
 
-   SUBDIR += acm
-   SUBDIR += astrolog
-   SUBDIR += golddig
-   SUBDIR += jetpack
-   SUBDIR += nethack
-   SUBDIR += oneko
-   SUBDIR += spider
-   SUBDIR += tksol
-   SUBDIR += xasteroids
-   SUBDIR += xbill
-   SUBDIR += xboard
-   SUBDIR += xboing
-   SUBDIR += xchomp
-   SUBDIR += xemeraldia
-   SUBDIR += xevil
-   SUBDIR += xgalaga
-   SUBDIR += xinvaders
-   SUBDIR += xjewel
-   SUBDIR += xkobo
-   SUBDIR += xlife
-   SUBDIR += xmille
-   SUBDIR += xmine
-   SUBDIR += xminesweep
-   SUBDIR += xmj
-   SUBDIR += xmris
-   SUBDIR += xonix
-   SUBDIR += xpacman
-   SUBDIR += xpilot
-   SUBDIR += xpipeman
-   SUBDIR += xrisk
-   SUBDIR += xrobots
-   SUBDIR += xsol
-   SUBDIR += xtetris
-   SUBDIR += xtic
+    SUBDIR += acm
+    SUBDIR += astrolog
+    SUBDIR += golddig
+    SUBDIR += jetpack
+    SUBDIR += nethack
+    SUBDIR += oneko
+    SUBDIR += spider
+    SUBDIR += tksol
+    SUBDIR += xasteroids
+    SUBDIR += xbill
+    SUBDIR += xboard
+    SUBDIR += xboing
+    SUBDIR += xchomp
+    SUBDIR += xemeraldia
+    SUBDIR += xevil
+    SUBDIR += xgalaga
+    SUBDIR += xinvaders
+    SUBDIR += xjewel
+    SUBDIR += xkobo
+    SUBDIR += xlife
+    SUBDIR += xmille
+    SUBDIR += xmine
+    SUBDIR += xminesweep
+    SUBDIR += xmj
+    SUBDIR += xmris
+    SUBDIR += xonix
+    SUBDIR += xpacman
+    SUBDIR += xpilot
+    SUBDIR += xpipeman
+    SUBDIR += xrisk
+    SUBDIR += xrobots
+    SUBDIR += xsol
+    SUBDIR += xtetris
+    SUBDIR += xtic
 
 .include <bsd.port.subdir.mk>
diff --git a/lang/Makefile b/lang/Makefile
index acd7dd37fcae..d2d747617346 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,33 +1,33 @@
-# $Id: Makefile,v 1.38 1995/08/24 01:44:35 asami Exp $
+# $Id: Makefile,v 1.39 1995/10/03 02:57:01 erich Exp $
 #
 
-   SUBDIR += Gofer
-   SUBDIR += STk
-   SUBDIR += Sather
-   SUBDIR += bwbasic
-   SUBDIR += eiffel
-   SUBDIR += elk
-   BROKEN += expect      # no package file yet
-   SUBDIR += forth
-   SUBDIR += g77
-   SUBDIR += gcl
-   BROKEN += gnat   # not really broken, just requires existing gnat compiler
-   SUBDIR += guile-ii
-   SUBDIR += icon
-   SUBDIR += itcl
-   SUBDIR += logo
-   SUBDIR += mit-scheme
-   SUBDIR += p2c
-   SUBDIR += pTk
-   SUBDIR += pbasic
-   SUBDIR += perl5
-   SUBDIR += python
-   SUBDIR += scheme48
-   SUBDIR += schemetoc
-   SUBDIR += scm
-   SUBDIR += smalltalk
-   SUBDIR += tcl
-   SUBDIR += tcl74
-   SUBDIR += tclX
+    SUBDIR += Gofer
+    SUBDIR += STk
+    SUBDIR += Sather
+    SUBDIR += bwbasic
+    SUBDIR += eiffel
+    SUBDIR += elk
+    BROKEN += expect      # no package files yet
+    SUBDIR += forth
+    SUBDIR += g77
+    SUBDIR += gcl
+    BROKEN += gnat   # not really broken, just requires existing gnat compiler
+    SUBDIR += guile-ii
+    SUBDIR += icon
+    SUBDIR += itcl
+    SUBDIR += logo
+    SUBDIR += mit-scheme
+    SUBDIR += p2c
+    SUBDIR += pTk
+    SUBDIR += pbasic
+    SUBDIR += perl5
+    SUBDIR += python
+    SUBDIR += scheme48
+    SUBDIR += schemetoc
+    SUBDIR += scm
+    SUBDIR += smalltalk
+    SUBDIR += tcl
+    SUBDIR += tcl74
+    SUBDIR += tclX
 
 .include <bsd.port.subdir.mk>
diff --git a/math/Makefile b/math/Makefile
index 3fda62510b43..e8646ae466b0 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,20 +1,19 @@
-# $Id: Makefile,v 1.12 1995/07/01 09:17:15 asami Exp $
-#
-# RESTRICTED: maxima (license required)
+# $Id: Makefile,v 1.13 1995/08/18 08:53:54 asami Exp $
 #
 
-   SUBDIR += blas
-   SUBDIR += calc
-   SUBDIR += eispack
-   SUBDIR += fudgit
-   SUBDIR += gmp
-   SUBDIR += gnuplot
-   SUBDIR += hexcalc
-   SUBDIR += linpack
-   SUBDIR += octave
-   SUBDIR += oleo
-   SUBDIR += xgraph
-   SUBDIR += xlispstat
-   SUBDIR += xspread
+    SUBDIR += blas
+    SUBDIR += calc
+    SUBDIR += eispack
+    SUBDIR += fudgit
+    SUBDIR += gmp
+    SUBDIR += gnuplot
+    SUBDIR += hexcalc
+    SUBDIR += linpack
+RESTRICTED += maxima (license required)
+    SUBDIR += octave
+    SUBDIR += oleo
+    SUBDIR += xgraph
+    SUBDIR += xlispstat
+    SUBDIR += xspread
 
 .include <bsd.port.subdir.mk>
diff --git a/news/Makefile b/news/Makefile
index 41adff9bdcfd..85660d6c38d4 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -1,12 +1,12 @@
-# $Id: Makefile,v 1.9 1995/07/01 10:08:26 asami Exp $
+# $Id: Makefile,v 1.10 1995/07/15 22:48:36 torstenb Exp $
 #
 
-   SUBDIR += cnews
-   SUBDIR += inn
-   SUBDIR += nn
-   SUBDIR += nntp
-   SUBDIR += rkive
-   SUBDIR += tin
-   SUBDIR += trn
+    SUBDIR += cnews
+    SUBDIR += inn
+    SUBDIR += nn
+    SUBDIR += nntp
+    SUBDIR += rkive
+    SUBDIR += tin
+    SUBDIR += trn
 
 .include <bsd.port.subdir.mk>
diff --git a/print/Makefile b/print/Makefile
index df8f6c4bb052..7f939fae3be6 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,25 +1,25 @@
-# $Id: Makefile,v 1.18 1995/05/14 03:29:57 asami Exp $
+# $Id: Makefile,v 1.19 1995/07/15 23:23:05 jmz Exp $
 #
 
-   SUBDIR += a2ps
-   SUBDIR += afm
-   SUBDIR += dvi2xx
-   SUBDIR += dvips
-   SUBDIR += dviselect
-   SUBDIR += ghostscript
-   SUBDIR += ghostview
-   SUBDIR += latex
-   SUBDIR += latex209
-   SUBDIR += makeindex
-   SUBDIR += mltex
-   SUBDIR += musixtex
-   SUBDIR += psutils
-   SUBDIR += rtf2latex
-   SUBDIR += tex
-   SUBDIR += texinfo
-   SUBDIR += tr2latex
-   SUBDIR += transfig
-   SUBDIR += xdvi
-   SUBDIR += xtexshell
+    SUBDIR += a2ps
+    SUBDIR += afm
+    SUBDIR += dvi2xx
+    SUBDIR += dvips
+    SUBDIR += dviselect
+    SUBDIR += ghostscript
+    SUBDIR += ghostview
+    SUBDIR += latex
+    SUBDIR += latex209
+    SUBDIR += makeindex
+    SUBDIR += mltex
+    SUBDIR += musixtex
+    SUBDIR += psutils
+    SUBDIR += rtf2latex
+    SUBDIR += tex
+    SUBDIR += texinfo
+    SUBDIR += tr2latex
+    SUBDIR += transfig
+    SUBDIR += xdvi
+    SUBDIR += xtexshell
 
 .include <bsd.port.subdir.mk>
diff --git a/russian/Makefile b/russian/Makefile
index aac35e3d0e72..f39281beb641 100644
--- a/russian/Makefile
+++ b/russian/Makefile
@@ -1,6 +1,9 @@
-# $Id: Makefile,v 1.3 1995/08/30 00:54:12 ache Exp $
+# $Id: Makefile,v 1.4 1995/08/31 20:04:58 ache Exp $
 #
 
-SUBDIR= d1489 X.language netscape.language pgp.language
+    SUBDIR += d1489
+    SUBDIR += X.language
+    SUBDIR += netscape.language
+    SUBDIR += pgp.language
 
 .include <bsd.port.subdir.mk>
diff --git a/shells/Makefile b/shells/Makefile
index 91bc1af26a55..f468aac0bf57 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,6 +1,9 @@
-# $Id: Makefile,v 1.8 1995/04/25 07:03:53 asami Exp $
+# $Id: Makefile,v 1.9 1995/05/14 03:30:01 asami Exp $
 #
 
-SUBDIR=	bash pdksh tcsh zsh
+    SUBDIR += bash
+    SUBDIR += pdksh
+    SUBDIR += tcsh
+    SUBDIR += zsh
 
 .include <bsd.port.subdir.mk>
diff --git a/x11/Makefile b/x11/Makefile
index 1931cb950eb2..e8fd5c826f00 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,42 +1,42 @@
-# $Id: Makefile,v 1.76 1995/08/19 08:00:01 asami Exp $
+# $Id: Makefile,v 1.77 1995/09/28 02:08:30 jmz Exp $
 #
 
-   SUBDIR += FWF
-   SUBDIR += XFree86
-   SUBDIR += Xaw3d
-   SUBDIR += blt
-   SUBDIR += color_xterm
-   SUBDIR += ctwm
-   SUBDIR += emiclock
-   SUBDIR += emu
-   SUBDIR += fvwm
-   SUBDIR += iv
-   SUBDIR += olvwm
-   SUBDIR += piewm
-   SUBDIR += rxvt
-   SUBDIR += sxpc
-   SUBDIR += tk
-   SUBDIR += tk4
-   SUBDIR += tvtwm
-   SUBDIR += viewfax
-   SUBDIR += x3270
-   SUBDIR += xbuffy
-   SUBDIR += xcb
-   SUBDIR += xcolors
-   SUBDIR += xdaliclock
-   SUBDIR += xdtm
-   SUBDIR += xearth
-   SUBDIR += xfed
-   SUBDIR += xfm
-   SUBDIR += xgrab
-   SUBDIR += xkeycaps
-   SUBDIR += xloadimage
-   SUBDIR += xlockmore
-   SUBDIR += xphoon
-   SUBDIR += xscreensaver
-   SUBDIR += xsnow
-   SUBDIR += xview-config
-   SUBDIR += xview-lib
-   SUBDIR += xview-clients
+    SUBDIR += FWF
+    SUBDIR += XFree86
+    SUBDIR += Xaw3d
+    SUBDIR += blt
+    SUBDIR += color_xterm
+    SUBDIR += ctwm
+    SUBDIR += emiclock
+    SUBDIR += emu
+    SUBDIR += fvwm
+    SUBDIR += iv
+    SUBDIR += olvwm
+    SUBDIR += piewm
+    SUBDIR += rxvt
+    SUBDIR += sxpc
+    SUBDIR += tk
+    SUBDIR += tk4
+    SUBDIR += tvtwm
+    SUBDIR += viewfax
+    SUBDIR += x3270
+    SUBDIR += xbuffy
+    SUBDIR += xcb
+    SUBDIR += xcolors
+    SUBDIR += xdaliclock
+    SUBDIR += xdtm
+    SUBDIR += xearth
+    SUBDIR += xfed
+    SUBDIR += xfm
+    SUBDIR += xgrab
+    SUBDIR += xkeycaps
+    SUBDIR += xloadimage
+    SUBDIR += xlockmore
+    SUBDIR += xphoon
+    SUBDIR += xscreensaver
+    SUBDIR += xsnow
+    SUBDIR += xview-config
+    SUBDIR += xview-lib
+    SUBDIR += xview-clients
 
 .include <bsd.port.subdir.mk>