diff options
| -rw-r--r-- | src/lib/libssl/Makefile.bsd-wrapper | 10 | ||||
| -rw-r--r-- | src/lib/libssl/crypto-patent/Makefile | 6 | ||||
| -rw-r--r-- | src/lib/libssl/crypto/Makefile | 6 | ||||
| -rw-r--r-- | src/lib/libssl/ssl-patent/Makefile | 6 | ||||
| -rw-r--r-- | src/lib/libssl/ssl/Makefile | 6 |
5 files changed, 7 insertions, 27 deletions
diff --git a/src/lib/libssl/Makefile.bsd-wrapper b/src/lib/libssl/Makefile.bsd-wrapper index de2b6c21d0..5a06d3eb4b 100644 --- a/src/lib/libssl/Makefile.bsd-wrapper +++ b/src/lib/libssl/Makefile.bsd-wrapper | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Build wrapper for OpenSSL | 1 | # Build wrapper for OpenSSL |
| 2 | # $OpenBSD: Makefile.bsd-wrapper,v 1.11 1999/09/29 07:30:08 beck Exp $ | 2 | # $OpenBSD: Makefile.bsd-wrapper,v 1.12 1999/10/10 21:32:01 maja Exp $ |
| 3 | 3 | ||
| 4 | # Our lndir is hacked; specify a full path to avoid potential conflicts | 4 | # Our lndir is hacked; specify a full path to avoid potential conflicts |
| 5 | # with the one installed with X11. | 5 | # with the one installed with X11. |
| @@ -11,11 +11,8 @@ LNDIR= /usr/bin/lndir | |||
| 11 | .if ${MACHINE_ARCH} == "i386" | 11 | .if ${MACHINE_ARCH} == "i386" |
| 12 | SSLCONF= --openssldir=/etc/ssl OpenBSD-x86 | 12 | SSLCONF= --openssldir=/etc/ssl OpenBSD-x86 |
| 13 | .else | 13 | .else |
| 14 | .if ${MACHINE} == "pmax" | 14 | .if ${MACHINE_ARCH} == "mips" |
| 15 | SSLCONF= --openssldir=/etc/ssl OpenBSD-pmax | 15 | SSLCONF= --openssldir=/etc/ssl OpenBSD-mips |
| 16 | .else | ||
| 17 | .if ${MACHINE} == "arc" | ||
| 18 | SSLCONF= --openssldir=/etc/ssl OpenBSD-arc | ||
| 19 | .else | 16 | .else |
| 20 | .if ${MACHINE_ARCH} == "alpha" | 17 | .if ${MACHINE_ARCH} == "alpha" |
| 21 | SSLCONF= --openssldir=/etc/ssl OpenBSD-alpha | 18 | SSLCONF= --openssldir=/etc/ssl OpenBSD-alpha |
| @@ -33,7 +30,6 @@ SSLCONF= --openssldir=/etc/ssl OpenBSD | |||
| 33 | .endif | 30 | .endif |
| 34 | .endif | 31 | .endif |
| 35 | .endif | 32 | .endif |
| 36 | .endif | ||
| 37 | 33 | ||
| 38 | MUNGEDFILES = ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/Makefile ${.OBJDIR}/${SSL_SRC}/apps/der_chop ${.OBJDIR}/${SSL_SRC}/tools/c_rehash | 34 | MUNGEDFILES = ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/Makefile ${.OBJDIR}/${SSL_SRC}/apps/der_chop ${.OBJDIR}/${SSL_SRC}/tools/c_rehash |
| 39 | 35 | ||
diff --git a/src/lib/libssl/crypto-patent/Makefile b/src/lib/libssl/crypto-patent/Makefile index c5b0623b0b..3d792a5a52 100644 --- a/src/lib/libssl/crypto-patent/Makefile +++ b/src/lib/libssl/crypto-patent/Makefile | |||
| @@ -9,10 +9,7 @@ LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/include | |||
| 9 | .if ${MACHINE_ARCH} == "i386" | 9 | .if ${MACHINE_ARCH} == "i386" |
| 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM | 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM |
| 11 | .else | 11 | .else |
| 12 | .if ${MACHINE_ARCH} == "arc" | 12 | .if ${MACHINE_ARCH} == "mips" |
| 13 | CFLAGS+= -DL_ENDIAN | ||
| 14 | .else | ||
| 15 | .if ${MACHINE_ARCH} == "pmax" | ||
| 16 | CFLAGS+= -DL_ENDIAN | 13 | CFLAGS+= -DL_ENDIAN |
| 17 | .else | 14 | .else |
| 18 | .if ${MACHINE_ARCH} == "alpha" | 15 | .if ${MACHINE_ARCH} == "alpha" |
| @@ -22,7 +19,6 @@ CFLAGS+= -DB_ENDIAN | |||
| 22 | .endif | 19 | .endif |
| 23 | .endif | 20 | .endif |
| 24 | .endif | 21 | .endif |
| 25 | .endif | ||
| 26 | 22 | ||
| 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH | 23 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH |
| 28 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} | 24 | CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} |
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile index 2250c59621..1dea336f27 100644 --- a/src/lib/libssl/crypto/Makefile +++ b/src/lib/libssl/crypto/Makefile | |||
| @@ -9,10 +9,7 @@ LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/include | |||
| 9 | .if ${MACHINE_ARCH} == "i386" | 9 | .if ${MACHINE_ARCH} == "i386" |
| 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM | 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM |
| 11 | .else | 11 | .else |
| 12 | .if ${MACHINE_ARCH} == "arc" | 12 | .if ${MACHINE_ARCH} == "mips" |
| 13 | CFLAGS+= -DL_ENDIAN | ||
| 14 | .else | ||
| 15 | .if ${MACHINE_ARCH} == "pmax" | ||
| 16 | CFLAGS+= -DL_ENDIAN | 13 | CFLAGS+= -DL_ENDIAN |
| 17 | .else | 14 | .else |
| 18 | .if ${MACHINE_ARCH} == "alpha" | 15 | .if ${MACHINE_ARCH} == "alpha" |
| @@ -21,7 +18,6 @@ CFLAGS+= -DL_ENDIAN | |||
| 21 | CFLAGS+= -DB_ENDIAN | 18 | CFLAGS+= -DB_ENDIAN |
| 22 | .endif | 19 | .endif |
| 23 | .endif | 20 | .endif |
| 24 | .endif | ||
| 25 | .endif | 21 | .endif |
| 26 | 22 | ||
| 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH | 23 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH |
diff --git a/src/lib/libssl/ssl-patent/Makefile b/src/lib/libssl/ssl-patent/Makefile index b3ab904298..78acd2183b 100644 --- a/src/lib/libssl/ssl-patent/Makefile +++ b/src/lib/libssl/ssl-patent/Makefile | |||
| @@ -9,10 +9,7 @@ LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto | |||
| 9 | .if ${MACHINE_ARCH} == "i386" | 9 | .if ${MACHINE_ARCH} == "i386" |
| 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM | 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM |
| 11 | .else | 11 | .else |
| 12 | .if ${MACHINE_ARCH} == "arc" | 12 | .if ${MACHINE_ARCH} == "mips" |
| 13 | CFLAGS+= -DL_ENDIAN | ||
| 14 | .else | ||
| 15 | .if ${MACHINE_ARCH} == "pmax" | ||
| 16 | CFLAGS+= -DL_ENDIAN | 13 | CFLAGS+= -DL_ENDIAN |
| 17 | .else | 14 | .else |
| 18 | .if ${MACHINE_ARCH} == "alpha" | 15 | .if ${MACHINE_ARCH} == "alpha" |
| @@ -21,7 +18,6 @@ CFLAGS+= -DL_ENDIAN | |||
| 21 | CFLAGS+= -DB_ENDIAN | 18 | CFLAGS+= -DB_ENDIAN |
| 22 | .endif | 19 | .endif |
| 23 | .endif | 20 | .endif |
| 24 | .endif | ||
| 25 | .endif | 21 | .endif |
| 26 | 22 | ||
| 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE | 23 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE |
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile index 8efe8fa3de..0f80ee5188 100644 --- a/src/lib/libssl/ssl/Makefile +++ b/src/lib/libssl/ssl/Makefile | |||
| @@ -9,10 +9,7 @@ LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto | |||
| 9 | .if ${MACHINE_ARCH} == "i386" | 9 | .if ${MACHINE_ARCH} == "i386" |
| 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM | 10 | CFLAGS+= -DL_ENDIAN -DBN_ASM |
| 11 | .else | 11 | .else |
| 12 | .if ${MACHINE_ARCH} == "arc" | 12 | .if ${MACHINE_ARCH} == "mips" |
| 13 | CFLAGS+= -DL_ENDIAN | ||
| 14 | .else | ||
| 15 | .if ${MACHINE_ARCH} == "pmax" | ||
| 16 | CFLAGS+= -DL_ENDIAN | 13 | CFLAGS+= -DL_ENDIAN |
| 17 | .else | 14 | .else |
| 18 | .if ${MACHINE_ARCH} == "alpha" | 15 | .if ${MACHINE_ARCH} == "alpha" |
| @@ -21,7 +18,6 @@ CFLAGS+= -DL_ENDIAN | |||
| 21 | CFLAGS+= -DB_ENDIAN | 18 | CFLAGS+= -DB_ENDIAN |
| 22 | .endif | 19 | .endif |
| 23 | .endif | 20 | .endif |
| 24 | .endif | ||
| 25 | .endif | 21 | .endif |
| 26 | 22 | ||
| 27 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE | 23 | CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE |
