diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr index a691141c9..704efb24e 100644 --- a/distrib/sets/sets.subr +++ b/distrib/sets/sets.subr @@ -210,7 +210,6 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g" # compatmodules ${MKCOMPATMODULES} != no # compattests ${MKCOMPATTESTS} != no # crypto ${MKCRYPTO} != no -# crypto_rc5 ${MKCRYPTO_RC5} != no # cvs ${MKCVS} != no # debug ${MKDEBUG} != no # debuglib ${MKDEBUGLIB} != no diff --git a/etc/Makefile.params b/etc/Makefile.params index 927147c7c..57f13ae3f 100644 --- a/etc/Makefile.params +++ b/etc/Makefile.params @@ -44,7 +44,7 @@ RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \ MACHINE MACHINE_ARCH MAKE MAKECONF MAKEFLAGS \ MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \ MKARZERO MKATF MKBFD MKBINUTILS MKCATPAGES \ - MKCRYPTO MKCRYPTO_RC5 MKCTF MKCVS \ + MKCRYPTO MKCTF MKCVS \ MKDEBUG MKDEBUGLIB MKDOC MKDTRACE MKDYNAMICROOT \ MKGCC MKGCCCMDS MKGDB \ MKHESIOD MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \ diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 597a34abb..79b87b922 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -151,9 +151,6 @@ MKCRYPTO If "no", no cryptography support will be built into the system, and also acts as "MKKERBEROS=no". Default: yes -MKCRYPTO_RC5 If not "no", RC5 support will be built into libcrypto_rc5 - Default: no - MKCTF If "no", do not build and install CTF tools, and also don't generate and manipulate CTF data of ELF binaries during build. @@ -1528,9 +1525,6 @@ DPADD Additional dependencies for the program. Usually used for LIBCRTI?= ${DESTDIR}/usr/lib/crti.o LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a - LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a - LIBCRYPTO_MDC2?=${DESTDIR}/usr/lib/libcrypto_mdc2.a - LIBCRYPTO_RC5?= ${DESTDIR}/usr/lib/libcrypto_rc5.a LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 946e5dece..9e5a3e087 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1292,7 +1292,7 @@ MKKMOD= no # _MKVARS.no= \ MKBSDGREP MKBSDTAR \ - MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCRYPTO_RC5 MKCTF MKDEBUG \ + MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCTF MKDEBUG \ MKDEBUGLIB MKDTRACE MKEXTSRC MKGROFFHTMLDOC \ MKKYUA MKLLD MKLLDB MKLINT \ MKMANZ MKMCLINKER MKOBJDIRS \ diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index ce10cf5d9..9f18f5382 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -115,9 +115,6 @@ LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o compat \ crypt \ crypto \ - crypto_idea \ - crypto_mdc2 \ - crypto_rc5 \ curses \ dbm \ des \