diff options
| author | dinoex <dinoex@FreeBSD.org> | 2003-10-12 11:14:52 +0000 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2003-10-12 11:14:52 +0000 |
| commit | 3d4ceb43bfa383685df46e978303264cb9fbf44d (patch) | |
| tree | 274f27ae1a13c368226c09307fd4fac8c83f918f | |
| parent | bf9c900a11c1eb5840c8a7ec3fbe8bf8e4db3909 (diff) | |
| download | FreeBSD-ports-3d4ceb43bfa383685df46e978303264cb9fbf44d.zip FreeBSD-ports-3d4ceb43bfa383685df46e978303264cb9fbf44d.tar.gz | |
- add CONFLICTS
- cleanup
- use DOCSDIR
Submitted by: eikemeier@fillmore-labs.com [CONFLICTS]
| -rw-r--r-- | security/openssl-beta/Makefile | 6 | ||||
| -rw-r--r-- | security/openssl-beta/pkg-plist | 4 | ||||
| -rw-r--r-- | security/openssl/Makefile | 13 | ||||
| -rw-r--r-- | security/openssl/pkg-plist | 4 |
4 files changed, 14 insertions, 13 deletions
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile index f1139f0..aa128d7 100644 --- a/security/openssl-beta/Makefile +++ b/security/openssl-beta/Makefile @@ -35,8 +35,10 @@ COMMENT= SSL and crypto library .error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif +CONFLICTS?= openssl-0.* +MAKE_ENV+= MANPREFIX=${MANPREFIX} NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch -NO_LATEST_LINK= yes +NO_LATEST_LINK= yes USE_PERL5_BUILD= yes OPENSSL_SHLIBVER?= 4 CFLAGS+= -Wl,-rpath,${LOCALBASE}/lib @@ -861,8 +863,6 @@ PLIST_SUB+= MANDIR="@comment " PLIST_SUB+= NOBASE="" .endif -MAKE_ENV+= MANPREFIX=${MANPREFIX} - .if defined(BATCH) || defined(OPENSSL_WITH_386) .if ${MACHINE_ARCH} == "i386" EXTRACONFIGURE= 386 diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist index c8feedc..506d08f 100644 --- a/security/openssl-beta/pkg-plist +++ b/security/openssl-beta/pkg-plist @@ -80,7 +80,7 @@ lib/pkgconfig/openssl.pc %%NOBASE%%openssl/misc/c_name %%NOBASE%%openssl/misc/der_chop %%NOBASE%%openssl/openssl.cnf.sample -%%PORTDOCS%%share/doc/openssl/openssl.txt +%%PORTDOCS%%%%DOCSDIR%%/openssl.txt @dirrm include/openssl @dirrm lib/pkgconfig %%NOBASE%%@dirrm openssl/certs @@ -93,4 +93,4 @@ lib/pkgconfig/openssl.pc %%NOBASE%%@dirrm openssl/misc %%NOBASE%%@dirrm openssl/private %%NOBASE%%@dirrm openssl -%%PORTDOCS%%@dirrm share/doc/openssl +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 879019b..402e7d8 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -20,10 +20,11 @@ COMMENT= SSL and crypto library .error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -MAKE_ENV+= MANPREFIX=${MANPREFIX} +CONFLICTS?= openssl-beta-0.* +MAKE_ENV+= MANPREFIX=${MANPREFIX} NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch USE_PERL5_BUILD= yes -OPENSSH_SHLIBVER?= 3 +OPENSSL_SHLIBVER?= 3 CFLAGS+= -Wl,-rpath,${LOCALBASE}/lib MAN1= CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 dhparam.1 \ @@ -827,8 +828,8 @@ PLIST_SUB+= SHARED="@comment " .else PLIST_SUB+= SHARED="" ALL_TARGET= freebsd-shared all -MAKE_ENV+= SHLIBVER=${OPENSSH_SHLIBVER} -PLIST_SUB+= SHLIBVER=${OPENSSH_SHLIBVER} +MAKE_ENV+= SHLIBVER=${OPENSSL_SHLIBVER} +PLIST_SUB+= SHLIBVER=${OPENSSL_SHLIBVER} INSTALLS_SHLIB= yes .endif @@ -862,8 +863,8 @@ do-configure: post-install: .if !defined(NOSHARED) .for i in libcrypto libssl - @${INSTALL_DATA} ${WRKSRC}/$i.so.${OPENSSH_SHLIBVER} ${PREFIX}/lib - @${LN} -sf $i.so.${OPENSSH_SHLIBVER} ${PREFIX}/lib/$i.so + @${INSTALL_DATA} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib + @${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${PREFIX}/lib/$i.so .endfor .endif .if !defined(NOPORTDOCS) diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist index c8feedc..506d08f 100644 --- a/security/openssl/pkg-plist +++ b/security/openssl/pkg-plist @@ -80,7 +80,7 @@ lib/pkgconfig/openssl.pc %%NOBASE%%openssl/misc/c_name %%NOBASE%%openssl/misc/der_chop %%NOBASE%%openssl/openssl.cnf.sample -%%PORTDOCS%%share/doc/openssl/openssl.txt +%%PORTDOCS%%%%DOCSDIR%%/openssl.txt @dirrm include/openssl @dirrm lib/pkgconfig %%NOBASE%%@dirrm openssl/certs @@ -93,4 +93,4 @@ lib/pkgconfig/openssl.pc %%NOBASE%%@dirrm openssl/misc %%NOBASE%%@dirrm openssl/private %%NOBASE%%@dirrm openssl -%%PORTDOCS%%@dirrm share/doc/openssl +%%PORTDOCS%%@dirrm %%DOCSDIR%% |
