diff options
author | dinoex <dinoex@FreeBSD.org> | 2009-02-23 20:58:23 +0800 |
---|---|---|
committer | dinoex <dinoex@FreeBSD.org> | 2009-02-23 20:58:23 +0800 |
commit | e15fb2efabac277fbd121b6d1d5acbc5f8d6e137 (patch) | |
tree | 3075f7efcab70871c15e56c569523facc30408d2 /security/openssl | |
parent | 8718695b51d489929c9cb98c3fd3eaedfd2f8f62 (diff) | |
download | freebsd-ports-gnome-e15fb2efabac277fbd121b6d1d5acbc5f8d6e137.tar.gz freebsd-ports-gnome-e15fb2efabac277fbd121b6d1d5acbc5f8d6e137.tar.zst freebsd-ports-gnome-e15fb2efabac277fbd121b6d1d5acbc5f8d6e137.zip |
- cleanup beta
Diffstat (limited to 'security/openssl')
-rw-r--r-- | security/openssl/Makefile | 9 | ||||
-rw-r--r-- | security/openssl/pkg-plist | 42 |
2 files changed, 20 insertions, 31 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 0b04dcbd4afc..30e39a3ed014 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -13,7 +13,6 @@ MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/%SUBDIR%/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/ MASTER_SITE_SUBDIR= source -PKGNAMESUFFIX?= ${BETA_SUFFIX}${BASE_SUFFIX}${PKGNAMESUFFIX2} DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org @@ -25,14 +24,6 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend .error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -.if defined(WITH_OPENSSL_BETA) -BETA_SUFFIX= -beta -CONFLICTS?= openssl-0.* openssl-stable-0.* -NO_LATEST_LINK= yes -.endif -PLIST_SUB+= OPENSSL_BETA="" -PLIST_SUB+= OPENSSL_STABLE="@comment " -CONFLICTS?= openssl-beta-0.* openssl-stable-0.* EXTRACONFIGURE+= enable-camellia MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist index f6ca9f0bd40a..315c4e4eae80 100644 --- a/security/openssl/pkg-plist +++ b/security/openssl/pkg-plist @@ -9,7 +9,7 @@ include/openssl/blowfish.h include/openssl/bn.h include/openssl/buffer.h include/openssl/cast.h -%%OPENSSL_BETA%%include/openssl/camellia.h +include/openssl/camellia.h include/openssl/comp.h include/openssl/conf.h include/openssl/conf_api.h @@ -19,12 +19,12 @@ include/openssl/des_old.h include/openssl/dh.h include/openssl/dsa.h include/openssl/dso.h -%%OPENSSL_BETA%%include/openssl/dtls1.h +include/openssl/dtls1.h include/openssl/e_os2.h include/openssl/ebcdic.h include/openssl/ec.h -%%OPENSSL_BETA%%include/openssl/ecdsa.h -%%OPENSSL_BETA%%include/openssl/ecdh.h +include/openssl/ecdsa.h +include/openssl/ecdh.h include/openssl/engine.h include/openssl/err.h include/openssl/evp.h @@ -36,7 +36,6 @@ include/openssl/lhash.h include/openssl/md2.h include/openssl/md4.h include/openssl/md5.h -%%OPENSSL_STABLE%%include/openssl/mdc2.h include/openssl/ocsp.h include/openssl/obj_mac.h include/openssl/objects.h @@ -47,12 +46,11 @@ include/openssl/pem.h include/openssl/pem2.h include/openssl/pkcs12.h include/openssl/pkcs7.h -%%OPENSSL_BETA%%include/openssl/pqueue.h -%%OPENSSL_BETA%%include/openssl/pq_compat.h +include/openssl/pqueue.h +include/openssl/pq_compat.h include/openssl/rand.h include/openssl/rc2.h include/openssl/rc4.h -%%OPENSSL_STABLE%%include/openssl/rc5.h include/openssl/ripemd.h include/openssl/rsa.h include/openssl/safestack.h @@ -62,7 +60,7 @@ include/openssl/ssl2.h include/openssl/ssl23.h include/openssl/ssl3.h include/openssl/stack.h -%%OPENSSL_BETA%%include/openssl/store.h +include/openssl/store.h include/openssl/symhacks.h include/openssl/tls1.h include/openssl/tmdiff.h @@ -72,26 +70,26 @@ include/openssl/ui_compat.h include/openssl/x509.h include/openssl/x509_vfy.h include/openssl/x509v3.h -%%OPENSSL_BETA%%lib/engines/lib4758cca.so -%%OPENSSL_BETA%%lib/engines/libaep.so -%%OPENSSL_BETA%%lib/engines/libatalla.so -%%OPENSSL_BETA%%lib/engines/libcapi.so -%%OPENSSL_BETA%%lib/engines/libchil.so -%%OPENSSL_BETA%%lib/engines/libcswift.so -%%OPENSSL_BETA%%lib/engines/libgmp.so -%%OPENSSL_BETA%%lib/engines/libnuron.so -%%OPENSSL_BETA%%lib/engines/libsureware.so -%%OPENSSL_BETA%%lib/engines/libubsec.so +lib/engines/lib4758cca.so +lib/engines/libaep.so +lib/engines/libatalla.so +lib/engines/libcapi.so +lib/engines/libchil.so +lib/engines/libcswift.so +lib/engines/libgmp.so +lib/engines/libnuron.so +lib/engines/libsureware.so +lib/engines/libubsec.so lib/libcrypto.a %%SHARED%%lib/libcrypto.so %%SHARED%%lib/libcrypto.so.%%SHLIBVER%% lib/libssl.a %%SHARED%%lib/libssl.so %%SHARED%%lib/libssl.so.%%SHLIBVER%% -%%OPENSSL_BETA%%libdata/pkgconfig/libcrypto.pc +libdata/pkgconfig/libcrypto.pc libdata/pkgconfig/openssl.pc -%%OPENSSL_BETA%%libdata/pkgconfig/libssl.pc -%%OPENSSL_BETA%%@dirrm lib/engines +libdata/pkgconfig/libssl.pc +@dirrm lib/engines openssl/misc/CA.pl openssl/misc/CA.sh openssl/misc/c_hash |