kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- new option WITH_OPENSSL_STABLE=yes

Browse source 
- updated CONFLICTS
This commit is contained in:
Dirk Meyer 2005-10-14 07:07:38 +00:00
parent 220c6040da
commit e46ff29836
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=145343
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
security/openssl/Makefile
View file

@ -10,7 +10,7 @@ PORTNAME= openssl
PORTVERSION= 0.9.8 PORTVERSION= 0.9.8
PORTREVISION!= date -v-1d +%Y%m%d PORTREVISION!= date -v-1d +%Y%m%d
.else .else
.if !defined(WITH_OPENSSL_BETA) && defined(WITH_OPENSSL_097) .if !defined(WITH_OPENSSL_BETA) && ( defined(WITH_OPENSSL_097) || defined(WITH_OPENSSL_STABLE) )
PORTVERSION= 0.9.7h PORTVERSION= 0.9.7h
PORTREVISION?= 1 PORTREVISION?= 1
.else .else
@ -44,24 +44,22 @@ DISTNAME2= ${PORTNAME}-${PORTVERSION}
.endif .endif
.if defined(WITH_OPENSSL_BETA) || defined(WITH_OPENSSL_SNAPSHOT) .if defined(WITH_OPENSSL_BETA) || defined(WITH_OPENSSL_SNAPSHOT)
.if defined(WITH_OPENSSL_BETA)
BETA_SUFFIX= -beta BETA_SUFFIX= -beta
CONFLICTS?= openssl-0.* CONFLICTS?= openssl-0.* openssl-stable-0.*
.endif
OPENSSL_SHLIBVER?= 4
NO_LATEST_LINK= yes NO_LATEST_LINK= yes
.else
CONFLICTS?= openssl-beta-0.*
.endif .endif
.if defined(WITH_OPENSSL_097) .if defined(WITH_OPENSSL_097) || defined(WITH_OPENSSL_STABLE)
BETA_SUFFIX= -stable
PLIST_SUB+= OPENSSL_BETA="@comment " PLIST_SUB+= OPENSSL_BETA="@comment "
PLIST_SUB+= OPENSSL_STABLE="" PLIST_SUB+= OPENSSL_STABLE=""
OPENSSL_SHLIBVER?= 3 OPENSSL_SHLIBVER?= 3
CONFLICTS?= openssl-0.* openssl-beta-0.*
.else .else
PATCHDIR= ${MASTERDIR}/files-beta PATCHDIR= ${MASTERDIR}/files-beta
PLIST_SUB+= OPENSSL_BETA="" PLIST_SUB+= OPENSSL_BETA=""
PLIST_SUB+= OPENSSL_STABLE="@comment " PLIST_SUB+= OPENSSL_STABLE="@comment "
OPENSSL_SHLIBVER?= 4 OPENSSL_SHLIBVER?= 4
CONFLICTS?= openssl-beta-0.* openssl-stable-0.*
.endif .endif
MAKE_ENV+= MANPREFIX=${MANPREFIX} MAKE_ENV+= MANPREFIX=${MANPREFIX}
@ -864,7 +862,7 @@ MLINKS= dgst.1 md4.1 \
ui_compat.3 des_read_pw_string.3 \ ui_compat.3 des_read_pw_string.3 \
des_modes.7 Modes_of_DES.7 des_modes.7 Modes_of_DES.7
.if !defined(WITH_OPENSSL_097) .if !defined(WITH_OPENSSL_097) && !defined(WITH_OPENSSL_STABLE)
MAN1+= ec.1 ecparam.1 MAN1+= ec.1 ecparam.1
MAN3+= ASN1_generate_nconf.3 BN_BLINDING_new.3 ERR_set_mark.3 \ MAN3+= ASN1_generate_nconf.3 BN_BLINDING_new.3 ERR_set_mark.3 \
ecdsa.3 OPENSSL_Applink.3 OPENSSL_ia32cap.3 x509.3 ecdsa.3 OPENSSL_Applink.3 OPENSSL_ia32cap.3 x509.3
@ -940,7 +938,7 @@ do-configure:
PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \ ./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
-L${PREFIX}/lib ${EXTRACONFIGURE} -L${PREFIX}/lib ${EXTRACONFIGURE}
.if defined(WITH_OPENSSL_097) .if defined(WITH_OPENSSL_097) || defined(WITH_OPENSSL_STABLE)
@${REINPLACE_CMD} \ @${REINPLACE_CMD} \
-e 's|^FIPS_DES_ENC=|#FIPS_DES_ENC=|' \ -e 's|^FIPS_DES_ENC=|#FIPS_DES_ENC=|' \
-e 's|^FIPS_SHA1_ASM_OBJ=|#FIPS_SHA1_ASM_OBJ=|' \ -e 's|^FIPS_SHA1_ASM_OBJ=|#FIPS_SHA1_ASM_OBJ=|' \