diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-01-12 07:53:20 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-01-12 07:53:20 +0000 |
| commit | 32f0c0d8ce1ce6e574dda19fa8e532c53d152704 (patch) | |
| tree | f5a297593223182d183a7585502ac49e5b4dc410 /security/openssl-beta | |
| parent | 00f9430272214b299c8f3a19138752980769d9f6 (diff) | |
- add flag BROKEN_MLINKS for problems with bsd.port.mk
- sync with openssl
- verfied for ia64
Notes
Notes:
svn path=/head/; revision=72959
Diffstat (limited to 'security/openssl-beta')
| -rw-r--r-- | security/openssl-beta/Makefile | 10 | ||||
| -rw-r--r-- | security/openssl-beta/files/patch-ac | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile index 774ed3cff8b3..81f64b212bb7 100644 --- a/security/openssl-beta/Makefile +++ b/security/openssl-beta/Makefile @@ -16,6 +16,10 @@ MASTER_SITES= http://www.openssl.org/source/ \ MAINTAINER= dinoex@FreeBSD.org +.ifdef USE_OPENSSL +.error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.endif + .include <bsd.port.pre.mk> .if ${PORTOBJFORMAT} == "aout" @@ -143,6 +147,7 @@ MAN3+= ASN1_OBJECT_new.3 ASN1_STRING_length.3 ASN1_STRING_new.3 \ d2i_PKCS8PrivateKey.3 d2i_DSAPublicKey.3 d2i_X509_ALGOR.3 \ d2i_X509_CRL.3 d2i_X509.3 d2i_X509_NAME.3 d2i_X509_REQ.3 \ d2i_X509_SIG.3 engine.3 pem.3 ui.3 ui_compat.3 +.if !defined(BROKEN_MLINKS) MLINKS= dgst.1 md4.1 \ dgst.1 sha.1 \ dgst.1 mdc2.1 \ @@ -819,13 +824,16 @@ MLINKS= dgst.1 md4.1 \ des_modes.7 DES.7 \ des_modes.7 Modes.7 \ des_modes.7 of.7 +.endif .if defined(BATCH) || defined(OPENSSL_WITH_386) +.if ${MACHINE_ARCH} == "i386" EXTRACONFIGURE= 386 .endif +.endif do-configure: - @cd ${WRKSRC} \ + cd ${WRKSRC} \ && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \ ./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \ -L${PREFIX}/lib ${EXTRACONFIGURE} diff --git a/security/openssl-beta/files/patch-ac b/security/openssl-beta/files/patch-ac index 8b071867ff41..e0c621fba728 100644 --- a/security/openssl-beta/files/patch-ac +++ b/security/openssl-beta/files/patch-ac @@ -7,7 +7,7 @@ -"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"FreeBSD-sparc64","$ENV{CC}:-DTERMIOS -DB_ENDIAN -DULTRASPARC -DBN_DIV2W $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Alpha Linux with GNU C and Compaq C setups # Special notes: |