From d5e63f727e097bb9c3288d8c9384942e1498d228 Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Sun, 6 Feb 2000 21:58:21 +0000 Subject: [PATCH] USE_OPENSSL, respect CC, CFLAGS, LOCALBASE Assisted by: Jim Bloom --- security/sslwrap/Makefile | 8 +------- security/sslwrap/files/patch-aa | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile index e11a6b5a6b72..7db06921643a 100644 --- a/security/sslwrap/Makefile +++ b/security/sslwrap/Makefile @@ -13,13 +13,7 @@ MASTER_SITES= http://www.rickk.com/sslwrap/ MAINTAINER= ZGabor@CoDe.HU -LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl \ - ssl.1:${PORTSDIR}/security/openssl - -.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES -LIB_DEPENDS= rsaref.2:${PORTSDIR}/security/rsaref -MAKE_ENV+= EXTRA_SSL_LIBS="-lRSAglue -lrsaref" -.endif +USE_OPENSSL= RSA WRKSRC= ${WRKDIR}/sslwrap205 diff --git a/security/sslwrap/files/patch-aa b/security/sslwrap/files/patch-aa index 81649dffe68d..ec6ed8ba6ab5 100644 --- a/security/sslwrap/files/patch-aa +++ b/security/sslwrap/files/patch-aa @@ -1,13 +1,26 @@ ---- Makefile.orig Tue Sep 28 07:49:54 1999 -+++ Makefile Sun Dec 26 10:22:14 1999 -@@ -14,8 +14,8 @@ +--- Makefile.orig Tue Sep 28 05:49:54 1999 ++++ Makefile Thu Jan 27 23:09:09 2000 +@@ -6,16 +6,19 @@ + + # Debug/Optimizations + #OPT = -g +-OPT = -O2 ++CFLAGS?=-O2 ++OPT = ${CFLAGS} ++ ++CC?= gcc + + # Define + OPENSSL="\"openssl/\"" + #OPENSSL="" all : - gcc -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \ +- gcc -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \ - -L/usr/local/ssl/lib -lssl -lcrypto \ - -I/usr/local/ssl/include \ -+ -L${PREFIX}/lib -lssl -lcrypto ${EXTRA_SSL_LIBS} \ -+ -I${PREFIX}/include \ ++ ${CC} -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \ ++ -L${OPENSSLLIB} -lssl -lcrypto ${EXTRA_SSL_LIBS} \ ++ -I${OPENSSLINC} \ ${EXTLIBS} clean: