From 7bd0b867654c2163211bdc7e017affec19be0f78 Mon Sep 17 00:00:00 2001
From: Dima Dorfman <dd@FreeBSD.org>
Date: Sun, 29 Jul 2001 08:58:22 +0000
Subject: [PATCH] Enable the new libmp in the build, and disable libgmp and its
 henchmen.

---
 Makefile.inc1             | 3 +--
 gnu/lib/Makefile          | 2 +-
 lib/Makefile              | 2 +-
 usr.bin/chkey/Makefile    | 2 +-
 usr.bin/newkey/Makefile   | 2 +-
 usr.sbin/keyserv/Makefile | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 06aefc0ec1f7..240f7747ec52 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -652,13 +652,11 @@ hierarchy:
 includes:
 	cd ${.CURDIR}/include;			${MAKE} -B all install
 	cd ${.CURDIR}/gnu/include;		${MAKE} install
-	cd ${.CURDIR}/gnu/lib/libmp;		${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libobjc;		${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libreadline/readline;	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libregex;		${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libstdc++;	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libdialog;	${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libgmp;		${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus;	${MAKE} beforeinstall
 .if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
 .if exists(${.CURDIR}/secure/lib/libcrypto)
@@ -705,6 +703,7 @@ includes:
 	cd ${.CURDIR}/lib/libftpio;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libkvm;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd;		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libmp;		${MAKE} beforeinstall
 .if !defined(WANT_CSRG_LIBM)
 	cd ${.CURDIR}/lib/msun;			${MAKE} beforeinstall
 .endif
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 41f323674005..cfd506068d9e 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR= csu libdialog libgcc libgmp libmp libregex libreadline
+SUBDIR= csu libdialog libgcc libregex libreadline
 
 .if ${OBJFORMAT} == aout
 .if !defined(NOLIBC_R)
diff --git a/lib/Makefile b/lib/Makefile
index 09b4378e0941..79882ed470c7 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -23,7 +23,7 @@ SUBDIR=	${_csu} libcom_err libcrypt msun libmd \
 	${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \
 	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
 	libedit libfetch libform libftpio libgnumalloc ${_libio} libipsec \
-	libipx libisc libkvm libmenu ${_libncp} \
+	libipx libisc libkvm libmenu libmp ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
 	libresolv librpcsvc libsmdb libsmutil libss \
 	libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index c0bbd6aea174..69c07f0a580d 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -8,6 +8,6 @@ SRCS=	chkey.c update.c generic.c
 CFLAGS+=-DYP
 
 DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBGMP}
-LDADD=	-lrpcsvc -lmp -lgmp
+LDADD=	-lrpcsvc -lmp -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index 560c02039e45..2ea0091b5add 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -8,6 +8,6 @@ MAN= newkey.8
 #CFLAGS+= -DYP
 
 DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBGMP}
-LDADD=	-lrpcsvc -lmp -lgmp
+LDADD=	-lrpcsvc -lmp -lcrypto
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile
index 09007e915375..60a0a6d0d561 100644
--- a/usr.sbin/keyserv/Makefile
+++ b/usr.sbin/keyserv/Makefile
@@ -10,7 +10,7 @@ CFLAGS+= -DOBJFORMAT_ELF
 .endif
 
 DPADD=	${LIBMP} ${LIBRPCSVC}
-LDADD=	-lmp -lrpcsvc
+LDADD=	-lmp -lcrypto -lrpcsvc
 
 RPCDIR=	${DESTDIR}/usr/include/rpcsvc