Update package Makefiles for automatic manual page handling.

42 files changed, 42 insertions, 263 deletions

diff --git a/lang/egcs-current/Makefile b/lang/egcs-current/Makefile
index 5531ff0a2cc..8d5c7f3ea1e 100644
--- a/lang/egcs-current/Makefile
+++ b/lang/egcs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/06/15 19:06:24 tv Exp $
+# $NetBSD: Makefile,v 1.3 1998/06/22 12:44:29 agc Exp $
 #
 
 DISTNAME=	egcs-19980608
@@ -14,7 +14,6 @@ USE_GMAKE=	yes
 MAKE_ENV+=	BISON=true
 PLIST_SRC=	${WRKSRC}/.PLIST
 
-MAN1=		cccp.1 g++.1 g77.1 gcc.1
 INFO_FILES=	cpp.info g77.info gcc.info
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index c08022dac79..937cac3584c 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:28 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:44:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/09/01 12:28:30 tg Exp
 #
 
@@ -11,6 +11,4 @@ MAINTAINER=	packages@netbsd.org
 
 ALL_TARGET=	default
 
-MAN1=		elk.1
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 85eb9483327..da479568c91 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/06/11 08:05:28 agc Exp $
+# $NetBSD: Makefile,v 1.13 1998/06/22 12:44:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.29 1998/01/27 01:11:47 fenner Exp
 #
 
@@ -20,16 +20,6 @@ CONFIGURE_ARGS= --enable-shared \
 		--with-tkconfig=${PREFIX}/lib/tk8.0 \
 		--with-tkinclude=${PREFIX}/include/tk8.0
 
-.include "../../mk/bsd.prefs.mk"
-
-# needed for japanese/expect
-.if !defined(NO_MAN_INSTALL)
-MAN1=		autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \
-		expect.1 expectk.1 kibitz.1 mkpasswd.1 passmass.1 \
-		tknewsbiff.1 unbuffer.1 xkibitz.1
-MAN3=		libexpect.3
-.endif
-
 post-extract:
 	${MV} ${WRKSRC}/example/rftp ${WRKSRC}/example/expect-rftp
 
diff --git a/lang/guavac/Makefile b/lang/guavac/Makefile
index 67ac4633bf6..6274b5168f2 100644
--- a/lang/guavac/Makefile
+++ b/lang/guavac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:28 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/06/22 12:44:30 agc Exp $
 #
 
 DISTNAME=	guavac-1.0
@@ -12,8 +12,6 @@ MASTER_SITES=	ftp://summit.stanford.edu/pub/guavac/ \
 MAINTAINER=	packages@netbsd.org
 
 GNU_CONFIGURE=  yes
-MAN1=		guavac.1
-CAT1=		guavac.0
 
 post-install:
 	${MV} ${PREFIX}/man/cat1/guavac.man ${PREFIX}/man/cat1/guavac.0
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 28f19ed431a..fc265cf835d 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/06/22 12:44:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp
 #
 
@@ -18,6 +18,4 @@ OPSYS!=         uname -s
 MANCOMPRESSED=	yes
 .endif
 
-MAN1=		icon.1
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 426eb131080..c76cbf9a155 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:29 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/06/22 12:44:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/08 09:37:16 obrien Exp
 #
 
@@ -18,7 +18,6 @@ MIRROR_DISTFILE=	no
 ONLY_FOR_ARCHS=		i386
 
 GNU_CONFIGURE=	yes
-MAN1=		kaffe.1
 
 post-install:
 	${MKDIR} ${PREFIX}/share/kaffe
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index 7bb857634e5..6a59965ce5b 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:29 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/06/22 12:44:31 agc Exp $
 #
 
 DISTNAME=       mawk1.2.2
@@ -10,6 +10,5 @@ MASTER_SITES=   ftp://ftp.oxy.edu/public/
 MAINTAINER=	agc@netbsd.org
 
 GNU_CONFIGURE=	yes
-MAN1=		mawk.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index fcca5bc2cd6..f2cbbb4f5d7 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/20 11:56:25 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1998/06/22 12:44:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
@@ -17,47 +17,6 @@ CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} \
 			-Darchname=${MACHINE_ARCH}-${LOPSYS}
 
-MAN1= 	a2p.1 c2ph.1 h2ph.1 h2xs.1 perl.1 perlapio.1 perlbook.1 perlbot.1 \
-	perlbug.1 perlcall.1 perldata.1 perldebug.1 perldelta.1 perldiag.1 \
-	perldoc.1 perldsc.1 perlembed.1 perlfaq.1 perlfaq1.1 perlfaq2.1 \
-	perlfaq3.1 perlfaq4.1 perlfaq5.1 perlfaq6.1 perlfaq7.1 perlfaq8.1 \
-	perlfaq9.1 perlform.1 perlfunc.1 perlguts.1 perlipc.1 perllocale.1 \
-	perllol.1 perlmod.1 perlmodlib.1 perlobj.1 perlop.1 perlpod.1 \
-	perlre.1 perlref.1 perlrun.1 perlsec.1 perlstyle.1 perlsub.1 \
-	perlsyn.1 perltie.1 perltoc.1 perltoot.1 perltrap.1 perlvar.1 \
-	perlxs.1 perlxstut.1 pl2pm.1 pod2html.1 pod2man.1 pstruct.1 s2p.1 \
-	splain.1 xsubpp.1
-
-MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 Benchmark.3 Bundle::CPAN.3 \
-	CGI.3 CGI::Apache.3 CGI::Carp.3 CGI::Fast.3 CGI::Push.3 \
-	CGI::Switch.3 CPAN.3 CPAN::FirstTime.3 CPAN::Nox.3 Carp.3 \
-	Class::Struct.3 Config.3 Cwd.3 DB_File.3 Devel::SelfStubber.3 \
-	DirHandle.3 DynaLoader.3 English.3 Env.3 Exporter.3 \
-	ExtUtils::Command.3 ExtUtils::Embed.3 ExtUtils::Install.3 \
-	ExtUtils::Liblist.3 ExtUtils::MM_OS2.3 ExtUtils::MM_Unix.3 \
-	ExtUtils::MM_VMS.3 ExtUtils::MM_Win32.3 ExtUtils::MakeMaker.3 \
-	ExtUtils::Manifest.3 ExtUtils::Miniperl.3 ExtUtils::Mkbootstrap.3 \
-	ExtUtils::Mksymlists.3 ExtUtils::testlib.3 Fcntl.3 File::Basename.3 \
-	File::CheckTree.3 File::Compare.3 File::Copy.3 File::DosGlob.3 \
-	File::Find.3 File::Path.3 File::stat.3 FileCache.3 FileHandle.3 \
-	FindBin.3 Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 IO.3 \
-	IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Seekable.3 IO::Select.3 \
-	IO::Socket.3 IPC::Open2.3 IPC::Open3.3 Math::BigFloat.3 \
-	Math::BigInt.3 Math::Complex.3 Math::Trig.3 NDBM_File.3 Net::Ping.3 \
-	Net::hostent.3 Net::netent.3 Net::protoent.3 Net::servent.3 Opcode.3 \
-	POSIX.3 Pod::Html.3 Pod::Text.3 SDBM_File.3 Safe.3 Search::Dict.3 \
-	SelectSaver.3 SelfLoader.3 Shell.3 Socket.3 Symbol.3 \
-	Sys::Hostname.3 Sys::Syslog.3 Term::Cap.3 Term::Complete.3 \
-	Term::ReadLine.3 Test::Harness.3 Text::Abbrev.3 Text::ParseWords.3 \
-	Text::Soundex.3 Text::Tabs.3 Text::Wrap.3 Tie::Hash.3 \
-	Tie::RefHash.3 Tie::Scalar.3 Tie::SubstrHash.3 Time::Local.3 \
-	Time::gmtime.3 Time::localtime.3 Time::tm.3 UNIVERSAL.3 \
-	User::grent.3 User::pwent.3 autouse.3 blib.3 constant.3 diagnostics.3 \
-	integer.3 less.3 lib.3 locale.3 ops.3 overload.3 sigtrap.3 strict.3 \
-	subs.3 vars.3 base.3
-
-MAN3PREFIX=	${PREFIX}/lib/perl5
-
 test:
 	@(cd ${WRKSRC}; make test)
 
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 7a113dea510..7abd062e08a 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/05/06 16:19:01 tron Exp $
+# $NetBSD: Makefile,v 1.6 1998/06/22 12:44:31 agc Exp $
 #
 
 DISTNAME=	pyth151
@@ -12,7 +12,6 @@ MAINTAINER=	tsarna@endicor.com
 WRKSRC=		${WRKDIR}/Python-1.5.1
 GNU_CONFIGURE=	yes
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
-MAN1=		python.1
 
 # Handle the module setup file:
 #   - disable some modules on 64 bit platforms
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 1fc66bde141..ccfd3476d77 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:25 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/06/22 12:44:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/08/27 19:31:37 jmacd Exp
 #
 
@@ -12,6 +12,5 @@ MAINTAINER= 	packages@netbsd.org
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS+= --prefix=${PREFIX}
 ALL_TARGET = 	enough
-MAN1=		scheme48.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 7202e5262e5..3e53c304d58 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/04/24 09:20:35 agc Exp $
+# $NetBSD: Makefile,v 1.12 1998/06/22 12:44:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/20 10:33:35 jkh Exp
 #
 
@@ -14,102 +14,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=		PORTSDIR=${.CURDIR}/../../../../..
 
-MAN1=	tclsh.1
-MAN3=	Alloc.3 AddErrInfo.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \
-	BackgdErr.3 Backslash.3 BoolObj.3 CallDel.3 CmdCmplt.3 Concat.3 \
-	CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 Eval.3 CrtCommand.3 \
-	CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 CrtSlave.3 \
-	CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 DoOneEvent.3 DoWhenIdle.3 \
-	DoubleObj.3 EvalObj.3 Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 \
-	GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 Hash.3 IntObj.3 Interp.3 \
-	LinkVar.3 ListObj.3 Notifier.3 ObjSetVar.3 Object.3 ObjectType.3 \
-	OpenFileChnl.3 OpenTcp.3 PkgRequire.3 Preserve.3 PrintDbl.3 RecEvalObj.3 \
-	RecordEval.3 RegExp.3 SetVar.3 SetErrno.3 SetRecLmt.3 SetResult.3 Sleep.3 \
-	SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 StringObj.3 Tcl_Main.3 \
-	TraceVar.3 Translate.3 UpVar.3 WrongNumArgs.3 TclConcatObj.3 \
-	Tcl_AddErrorInfo.3 Tcl_AddObjErrorInfo.3 Tcl_Alloc.3 Tcl_AllowExceptions.3 \
-	Tcl_AppInit.3 Tcl_AppendAllObjTypes.3 Tcl_AppendElement.3 \
-	Tcl_AppendResult.3 Tcl_AppendStringsToObj.3 Tcl_AppendToObj.3 \
-	Tcl_AsyncCreate.3 Tcl_AsyncDelete.3 Tcl_AsyncInvoke.3 Tcl_AsyncMark.3 \
-	Tcl_BackgroundError.3 Tcl_Backslash.3 Tcl_BadChannelOption.3 \
-	Tcl_CallWhenDeleted.3 Tcl_Close.3 Tcl_CancelIdleCall.3 \
-	Tcl_CommandComplete.3 Tcl_Concat.3 Tcl_ConvertElement.3 \
-	Tcl_ConvertToType.3 Tcl_CreateAlias.3 Tcl_CreateAliasObj.3 \
-	Tcl_CreateChannel.3 Tcl_CreateChannelHandler.3 Tcl_CreateCloseHandler.3 \
-	Tcl_CreateCommand.3 Tcl_CreateEventSource.3 Tcl_CreateExitHandler.3 \
-	Tcl_CreateFileHandler.3 Tcl_CreateHashEntry.3 Tcl_CreateInterp.3 Tcl_Eof.3 \
-	Tcl_CreateMathFunc.3 Tcl_CreateObjCommand.3 Tcl_CreateSlave.3 \
-	Tcl_CreateTimerHandler.3 Tcl_CreateTrace.3 Tcl_DStringAppend.3 \
-	Tcl_DStringAppendElement.3 Tcl_DStringEndSublist.3 Tcl_DStringFree.3 \
-	Tcl_DStringGetResult.3 Tcl_DStringInit.3 Tcl_DStringLength.3 \
-	Tcl_DStringResult.3 Tcl_DStringSetLength.3 Tcl_DStringStartSublist.3 \
-	Tcl_DStringValue.3 Tcl_Eval.3 Tcl_DecrRefCount.3 Tcl_DeleteAssocData.3 \
-	Tcl_DeleteChannelHandler.3 Tcl_DeleteCloseHandler.3 Tcl_DeleteCommand.3 \
-	Tcl_DeleteCommandFromToken.3 Tcl_DeleteEventSource.3 Tcl_DeleteEvents.3 \
-	Tcl_DeleteExitHandler.3 Tcl_DeleteFileHandler.3 Tcl_DeleteHashEntry.3 \
-	Tcl_DeleteHashTable.3 Tcl_DeleteInterp.3 Tcl_DeleteTimerHandler.3 \
-	Tcl_DeleteTrace.3 Tcl_DetachPids.3 Tcl_DoOneEvent.3 Tcl_DoWhenIdle.3 \
-	Tcl_DontCallWhenDeleted.3 Tcl_DuplicateObj.3 Tcl_EvalFile.3 Tcl_EvalObj.3 \
-	Tcl_EventuallyFree.3 Tcl_Exit.3 Tcl_ExposeCommand.3 Tcl_ExprBoolean.3 \
-	Tcl_ExprBooleanObj.3 Tcl_ExprDouble.3 Tcl_ExprDoubleObj.3 Tcl_ExprLong.3 \
-	Tcl_ExprLongObj.3 Tcl_ExprObj.3 Tcl_ExprString.3 Tcl_Finalize.3 \
-	Tcl_Flush.3 Tcl_FindExecutable.3 Tcl_FindHashEntry.3 Tcl_FirstHashEntry.3 \
-	Tcl_Free.3 Tcl_GetAlias.3 Tcl_GetAliasObj.3 Tcl_GetAssocData.3 \
-	Tcl_GetBoolean.3 Tcl_GetBooleanFromObj.3 Tcl_GetChannel.3 \
-	Tcl_GetChannelBufferSize.3 Tcl_GetChannelHandle.3 \
-	Tcl_GetChannelInstanceData.3 Tcl_GetChannelMode.3 Tcl_GetChannelName.3 \
-	Tcl_GetChannelOption.3 Tcl_GetDouble.3 Tcl_GetChannelType.3 \
-	Tcl_GetCommandInfo.3 Tcl_GetCommandName.3 Tcl_GetDoubleFromObj.3 \
-	Tcl_GetErrno.3 Tcl_GetHashKey.3 Tcl_GetHashValue.3 Tcl_GetIndexFromObj.3 \
-	Tcl_GetInt.3 Tcl_GetIntFromObj.3 Tcl_GetInterpPath.3 Tcl_GetLongFromObj.3 \
-	Tcl_GetMaster.3 Tcl_GetObjResult.3 Tcl_GetObjType.3 Tcl_GetOpenFile.3 \
-	Tcl_GetPathType.3 Tcl_GetSlave.3 Tcl_GetServiceMode.3 Tcl_GetStdChannel.3 \
-	Tcl_GetStringFromObj.3 Tcl_GetStringResult.3 Tcl_GetVar.3 Tcl_GetVar2.3 \
-	Tcl_Gets.3 Tcl_GlobalEval.3 Tcl_GlobalEvalObj.3 Tcl_HashStats.3 \
-	Tcl_HideCommand.3 Tcl_IncrRefCount.3 Tcl_InitHashTable.3 \
-	Tcl_InputBlocked.3 Tcl_InputBuffered.3 Tcl_Interp.3 Tcl_InterpDeleted.3 \
-	Tcl_IsSafe.3 Tcl_IsShared.3 Tcl_JoinPath.3 Tcl_LinkVar.3 \
-	Tcl_ListObjAppendElement.3 Tcl_ListObjAppendList.3 \
-	Tcl_ListObjGetElements.3 Tcl_ListObjIndex.3 Tcl_ListObjLength.3 \
-	Tcl_ListObjReplace.3 Tcl_MakeFileChannel.3 Tcl_MakeSafe.3 \
-	Tcl_MakeTcpClientChannel.3 Tcl_Merge.3 Tcl_NewBooleanObj.3 \
-	Tcl_NewDoubleObj.3 Tcl_NewIntObj.3 Tcl_NewListObj.3 Tcl_NewLongObj.3 \
-	Tcl_NewObj.3 Tcl_NewStringObj.3 Tcl_NextHashEntry.3 Tcl_NotifyChannel.3 \
-	Tcl_ObjGetVar2.3 Tcl_ObjSetVar2.3 Tcl_OpenCommandChannel.3 \
-	Tcl_OpenFileChannel.3 Tcl_OpenTcpClient.3 Tcl_OpenTcpServer.3 \
-	Tcl_PkgProvide.3 Tcl_PkgRequire.3 Tcl_PosixError.3 Tcl_Preserve.3 \
-	Tcl_PrintDouble.3 Tcl_QueueEvent.3 Tcl_Read.3 Tcl_Realloc.3 \
-	Tcl_ReapDetachedProcs.3 Tcl_RecordAndEval.3 Tcl_RecordAndEvalObj.3 \
-	Tcl_RegExpCompile.3 Tcl_RegExpExec.3 Tcl_RegExpMatch.3 Tcl_RegExpRange.3 \
-	Tcl_RegisterChannel.3 Tcl_RegisterObjType.3 Tcl_Release.3 \
-	Tcl_ResetResult.3 Tcl_ScanElement.3 Tcl_Seek.3 Tcl_ServiceAll.3 \
-	Tcl_ServiceEvent.3 Tcl_SetAssocData.3 Tcl_SetBooleanObj.3 \
-	Tcl_SetChannelBufferSize.3 Tcl_SetDoubleObj.3 Tcl_SetChannelOption.3 \
-	Tcl_SetCommandInfo.3 Tcl_SetDefaultTranslation.3 Tcl_SetErrno.3 \
-	Tcl_SetErrorCode.3 Tcl_SetHashValue.3 Tcl_SetIntObj.3 Tcl_SetListObj.3 \
-	Tcl_SetLongObj.3 Tcl_SetMaxBlockTime.3 Tcl_SetObjLength.3 \
-	Tcl_SetObjResult.3 Tcl_SetRecursionLimit.3 Tcl_SetResult.3 \
-	Tcl_SetServiceMode.3 Tcl_SetStdChannel.3 Tcl_SetStringObj.3 Tcl_Sleep.3 \
-	Tcl_SetTimer.3 Tcl_SetVar.3 Tcl_SetVar2.3 Tcl_SplitList.3 Tcl_SplitPath.3 \
-	Tcl_StaticPackage.3 Tcl_StringMatch.3 Tcl_Tell.3 Tcl_TraceVar.3 \
-	Tcl_TraceVar2.3 Tcl_TranslateFileName.3 Tcl_UnlinkVar.3 \
-	Tcl_UnregisterChannel.3 Tcl_UnsetVar.3 Tcl_UnsetVar2.3 Tcl_UntraceVar.3 \
-	Tcl_UntraceVar2.3 Tcl_UpVar.3 Tcl_UpVar2.3 Tcl_UpdateLinkedVar.3 \
-	Tcl_VarEval.3 Tcl_VarTraceInfo.3 Tcl_VarTraceInfo2.3 Tcl_WaitForEvent.3 \
-	Tcl_Write.3 Tcl_WrongNumArgs.3
-MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
-	catch.n cd.n clock.n close.n concat.n continue.n eof.n error.n eval.n \
-	exec.n exit.n expr.n fblocked.n fconfigure.n fcopy.n if.n file.n \
-	fileevent.n filename.n flush.n for.n foreach.n format.n gets.n glob.n \
-	global.n history.n http.n incr.n info.n interp.n join.n lappend.n \
-	library.n lindex.n linsert.n list.n llength.n load.n lrange.n lreplace.n \
-	lsearch.n lsort.n namespace.n open.n package.n pid.n pkgMkIndex.n proc.n \
-	puts.n pwd.n read.n regexp.n registry.n regsub.n rename.n resource.n \
-	return.n safe.n scan.n seek.n set.n socket.n source.n split.n string.n \
-	subst.n switch.n tclvars.n tell.n time.n trace.n unknown.n unset.n \
-	update.n uplevel.n upvar.n variable.n vwait.n while.n Base.n Http.n Safe.n \
-	pkg_mkIndex.n
-
 post-install:
 	${LDCONFIG} || ${TRUE}
 
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 9cb51bcd7f6..d5d5982628c 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/22 14:22:44 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/06/22 12:44:31 agc Exp $
 #
 
 DISTNAME=	tclX8.0.2
@@ -15,13 +15,4 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared --with-tk
 CONFIGURE_ENV+=	PREFIX=${PREFIX} TCL_SHLIB_LD_LIBS=-L${PREFIX}/lib
 
-MAN3=	TclCommandWriting.3 Tcl_HandleAlloc.3 Tcl_HandleFree.3 \
-	Tcl_HandleTblInit.3 Tcl_HandleTblRelease.3 Tcl_HandleTblUseCount.3 \
-	Tcl_HandleWalk.3 Tcl_HandleXlate.3 TclX_NewKeyedListObj.3 \
-	TclX_KeyedListGet.3 TclX_KeyedListSet.3 TclX_KeyedListDelete.3 \
-	TclX_KeyedListGetKeys.3 Tclx_Init.3 Tclxcmd_Init.3 TclX_Main.3 \
-	Tkx_Init.3 TkX_Main.3
-MANN=	ckalloc.n memory.n ckfree.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
-	Tcl_ValidateAllMemory.n TclX.n
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 3924d592933..ba83c5e3fc2 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/05/04 23:42:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1998/06/22 12:47:35 agc Exp $
 #
 
 DISTNAME=	rat-3.0.24
@@ -12,7 +12,6 @@ DEPENDS+=	tk-8.0p2:../../x11/tk80
 RESTRICTED=	"Contains DES encryption"
 MIRROR_DISTFILE=no
 USE_GMAKE=	yes
-MAN1=		rat.1
 
 do-build:
 	cd ${WRKSRC} && PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} ./Build rat
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index e3b9928cef7..600c85a2a28 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/05/23 15:42:59 tv Exp $
+# $NetBSD: Makefile,v 1.14 1998/06/22 12:47:35 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp 
 #
 
@@ -22,7 +22,6 @@ GSM_WORK=	${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-gsm=${GSM_WORK}
 INSTALL_TARGET=	install install-man
-MAN1=		vat.1
 
 post-install:
 	@strip ${PREFIX}/bin/vat
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 9f482756277..b48d3b19550 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:45 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/06/22 12:47:36 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp
 #
 
@@ -13,7 +13,6 @@ DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 GNU_CONFIGURE=	yes
 USE_X11=	yes
-MAN1=		vic.1
 
 post-install:
 	strip ${PREFIX}/bin/vic
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index d9187b3808f..f49794d9cb4 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/06/09 07:41:48 agc Exp $
+# $NetBSD: Makefile,v 1.13 1998/06/22 12:52:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -22,11 +22,6 @@ CONFIGURE_ARGS+=	--with-mmap
 MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-MAN8=			amadmin.8 amcheck.8 amdump.8 amflush.8 amlabel.8 \
-			amrestore.8 amtape.8 amanda.8 amcleanup.8 amtoc.8 \
-			amcheckdb.8 amoverview.8 amplot.8 amrecover.8 \
-			amrmtape.8 amverify.8
-
 pre-install:
 	@${SETENV} ${MAKE_ENV} addnerd -g ${AMANDA_GROUP} ${AMANDA_USER}
 
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index c0c0ab42681..102520ffc01 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:26 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/06/22 12:52:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/11/17 09:05:15 obrien Exp
 #
 
@@ -9,6 +9,5 @@ MASTER_SITES=   ftp://ftp.sun.ac.za/pub/unix/misc/
 MAINTAINER=	packages@netbsd.org
 
 NO_WRKSUBDIR=	yes
-MAN1=		buffer.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/cal/Makefile b/misc/cal/Makefile
index 97f365d374a..6a5548824ff 100644
--- a/misc/cal/Makefile
+++ b/misc/cal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:26 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/05/12 06:33:23 max Exp
 #
 
@@ -12,7 +12,6 @@ MAINTAINER=		packages@netbsd.org
 WRKSRC=			${WRKDIR}/cal-3.5/source
 MAKEFILE=		makefile.unx
 ALL_TARGET=		cal
-MAN1=			cal.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cal ${PREFIX}/bin/cal
diff --git a/misc/chord/Makefile b/misc/chord/Makefile
index 87283ca1d26..3f14decc9b4 100644
--- a/misc/chord/Makefile
+++ b/misc/chord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:27 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/04/30 03:18:06 asami Exp
 #
 
@@ -10,6 +10,5 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	packages@netbsd.org
 
 MANCOMPRESSED=	yes
-MAN1=		chord.1 a2crd.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index f16f8e8220b..2acf58b4451 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/05/26 22:07:19 tron Exp $
+# $NetBSD: Makefile,v 1.2 1998/06/22 12:52:31 agc Exp $
 #
 
 DISTNAME=       dialog-0.6z
@@ -12,7 +12,6 @@ DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 
 NO_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN1=		dialog.1
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/dialog
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index 5e36c5bb9cf..6aae32aeb10 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/05/08 22:43:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/06/22 12:52:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/20 13:19:30 wosch Exp
 #
 
@@ -16,7 +16,6 @@ RUN_DEPENDS=	wish8.0:../../x11/tk80
 IS_INTERACTIVE= yes
 .endif
 GNU_CONFIGURE=	yes
-MAN1=		dotfile.1
 
 do-build:
 	@${DO_NADA}
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index 48b095a3041..06dce096cb7 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:34 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/01/06 06:38:33 max Exp
 #
 
@@ -19,8 +19,6 @@ MAINTAINER=	nobu@psrc.isac.co.jp
 
 ALL_TARGET=	goal
 INSTALL_TARGET=	install
-MANLANG=	ja_JP.EUC
-MAN1=		fd.1
 
 do-configure:
 	cd ${WRKSRC} ; make config
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index deb6abebbf6..6b77e00574a 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:34 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1996/11/11 05:49:31 obrien Exp
 #
 
@@ -11,6 +11,5 @@ MAINTAINER=	nobu@psrc.isac.co.jp
 
 NO_WRKSUBDIR=	yes
 MANCOMPRESSED=	yes
-MAN1=		fep.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index c5d047618b6..f21cdb4d48d 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:27 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/06/29 09:56:32 obrien Exp
 #
 
@@ -10,6 +10,4 @@ MASTER_SITES=	ftp://ftp.nicoh.com/pub/figlet/program/unix/  \
 
 MAINTAINER=     packages@netbsd.org
 
-MAN6=		figlet.6
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/git/Makefile b/misc/git/Makefile
index a7ae41b2fd8..d5f123b530d 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/05/23 15:42:59 tv Exp $
+# $NetBSD: Makefile,v 1.12 1998/06/22 12:52:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp
 #
 
@@ -9,8 +9,6 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	packages@netbsd.org
 
 GNU_CONFIGURE=	YES
-MAN1=		git.1 gitaction.1 gitkeys.1 gitmount.1 gitps.1 gitrgrep.1 \
-		gitunpack.1 gitview.1
 INFO_FILES=	git.info
 
 pre-install:
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index 34ac8180b09..8476b7baf7b 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:35 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/30 04:43:34 asami Exp
 #
 
@@ -15,6 +15,5 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	bmc@WillsCreek.COM
 
 GNU_CONFIGURE=	yes
-MAN1=		linuxls.1 dircolors.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ical/Makefile b/misc/ical/Makefile
index 5dbd924de0f..fa99292c261 100644
--- a/misc/ical/Makefile
+++ b/misc/ical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:46 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/06/22 12:52:32 agc Exp $
 # $FreeBSD Id: Makefile,v 1.15 1998/02/07 22:59:16 hoek Exp
 #
 
@@ -18,8 +18,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-tkconfig=${PREFIX}/lib/tk8.0 \
 		--with-tkhdir=${PREFIX}/include/tk8.0
 
-MAN1=		ical.1
-
 post-install:
 	@strip ${PREFIX}/bin/${DISTNAME}
 
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index 14356220d57..9b5d05d4a21 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:27 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/06/22 12:52:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/04/02 07:58:25 obrien Exp
 #
 
@@ -10,7 +10,6 @@ MASTER_SITE_SUBDIR=	games/amusements
 MAINTAINER=		packages@netbsd.org
 
 WRKSRC=			${WRKDIR}/jive
-MAN1=			jive.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jive ${PREFIX}/bin
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index e5361863275..c142000b829 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/05/15 13:55:35 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/06/22 12:52:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/04/20 13:19:32 wosch Exp
 #
 
@@ -10,8 +10,6 @@ MAINTAINER=	packages@netbsd.org
 
 RUN_DEPENDS=	wish8.0:../../x11/tk80
 
-MAN1=		kp.1
-
 pre-configure:
 	for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
 		${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index 8ed22e5cd84..bb188bcbec9 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:36 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/06/22 12:52:33 agc Exp $
 #
 
 DISTNAME=	libutf-2.10
@@ -7,7 +7,6 @@ MASTER_SITES=	http://www.westley.demon.co.uk/src/
 
 MAINTAINER=	agc@netbsd.org
 
-MAN3=		ure.3 utf.3
 GNU_CONFIGURE=	yes
 ALL_TARGET=	tst
 
diff --git a/misc/lile/Makefile b/misc/lile/Makefile
index a877f2c99cb..c57d9049b29 100644
--- a/misc/lile/Makefile
+++ b/misc/lile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/08/15 16:47:08 jmz Exp
 #
 
@@ -10,8 +10,6 @@ EXTRACT_SUFX=	.tar.z
 
 MAINTAINER=	packages@netbsd.org
 
-MAN1=		ile.1
-
 do-configure:
 	@(cd ${WRKSRC}; ${MV} Makefile Makefile.old; \
 	${SED} -e s:/usr/local:${PREFIX}: <Makefile.old > Makefile; \
diff --git a/misc/linuxls/Makefile b/misc/linuxls/Makefile
index 34ac8180b09..8476b7baf7b 100644
--- a/misc/linuxls/Makefile
+++ b/misc/linuxls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:35 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/30 04:43:34 asami Exp
 #
 
@@ -15,6 +15,5 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	bmc@WillsCreek.COM
 
 GNU_CONFIGURE=	yes
-MAN1=		linuxls.1 dircolors.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index a8acbaec53b..8a7c7d67313 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:36 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/06/22 12:52:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/10/26 23:56:58 fenner Exp
 #
 
@@ -14,7 +14,5 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-etcdir=${PREFIX}/etc
 
 MANCOMPRESSED=	yes
-MAN1=		logsurfer.1
-MAN4=		logsurfer.conf.4
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 9c927a04c9a..a7a07932144 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/05/09 15:24:44 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1998/06/22 12:52:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
@@ -14,9 +14,6 @@ DEPENDS+=		ncurses-1.9.9g:../../devel/ncurses
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-ncurses --without-edit --without-subshell
 
-MAN1=			mc.1 mcedit.1
-MAN8=			mcserv.8
-
 pre-configure:
 	for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
 		${ECHO} patching $$f ; \
diff --git a/misc/most/Makefile b/misc/most/Makefile
index 42e41f10632..30c4fe120e0 100644
--- a/misc/most/Makefile
+++ b/misc/most/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:46 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/06/22 12:52:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/03 21:52:01 asami Exp
 #
 
@@ -14,6 +14,5 @@ DEPENDS+=	libslang-0.99.38:../../devel/libslang
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/most
-MAN1=		most.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index a6d1672d52e..7c8e9da6038 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/09/14 02:54:03 jfitz Exp
 #
 
@@ -14,7 +14,5 @@ USE_PERL5=		YES
 
 NO_BUILD=		YES
 WRKSRC=			${WRKDIR}/Array-PrintCols
-MAN3=			Array::PrintCols.3p
-MANPREFIX=		${PREFIX}/lib/perl5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index a3931b75c22..70eae47a838 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:51:12 jfitz Exp
 #
 
@@ -12,9 +12,6 @@ MAINTAINER=		packages@netbsd.org
 
 USE_PERL5=		YES
 
-MANPREFIX=		${PREFIX}/lib/perl5
-MAN3=			Locale::Country.3 Locale::Language.3
-
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
diff --git a/misc/p5-Search/Makefile b/misc/p5-Search/Makefile
index 09426d74984..3a937c1adb5 100644
--- a/misc/p5-Search/Makefile
+++ b/misc/p5-Search/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/06/24 18:43:31 jfitz Exp
 #
 
@@ -12,9 +12,6 @@ MAINTAINER=		packages@netbsd.org
 
 USE_PERL5=		YES
 
-MAN3=			Search::Base.3
-MANPREFIX=		${PREFIX}/lib/perl5
-
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 3471cbf32bc..155e0e75c51 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/05/23 15:42:59 tv Exp $
+# $NetBSD: Makefile,v 1.12 1998/06/22 12:52:34 agc Exp $
 #
 
 DISTNAME=	rpm-2.4.12
@@ -12,7 +12,6 @@ BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:../../databases/gdbm
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN8=		rpm.8 rpm2cpio.8
 
 pre-install:
 	${MKDIR} ${PREFIX}/include/rpm
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index 5c09c2d9ffd..f07ee5f029e 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/22 12:52:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/02 08:39:12 obrien Exp
 #
 
@@ -12,7 +12,6 @@ MAINTAINER=		packages@netbsd.org
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 ALL_TARGET=
-MAN1=			splitvt.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/splitvt ${PREFIX}/bin
diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile
index d9187b3808f..f49794d9cb4 100644
--- a/sysutils/amanda/Makefile
+++ b/sysutils/amanda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/06/09 07:41:48 agc Exp $
+# $NetBSD: Makefile,v 1.13 1998/06/22 12:52:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -22,11 +22,6 @@ CONFIGURE_ARGS+=	--with-mmap
 MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-MAN8=			amadmin.8 amcheck.8 amdump.8 amflush.8 amlabel.8 \
-			amrestore.8 amtape.8 amanda.8 amcleanup.8 amtoc.8 \
-			amcheckdb.8 amoverview.8 amplot.8 amrecover.8 \
-			amrmtape.8 amverify.8
-
 pre-install:
 	@${SETENV} ${MAKE_ENV} addnerd -g ${AMANDA_GROUP} ${AMANDA_USER}
 
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 9c927a04c9a..a7a07932144 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/05/09 15:24:44 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1998/06/22 12:52:33 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
@@ -14,9 +14,6 @@ DEPENDS+=		ncurses-1.9.9g:../../devel/ncurses
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-ncurses --without-edit --without-subshell
 
-MAN1=			mc.1 mcedit.1
-MAN8=			mcserv.8
-
 pre-configure:
 	for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
 		${ECHO} patching $$f ; \