Date: Mon, 3 Mar 2014 05:43:38 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346857 - head/Mk Message-ID: <201403030543.s235hcGi039227@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Mon Mar 3 05:43:38 2014 New Revision: 346857 URL: http://svnweb.freebsd.org/changeset/ports/346857 QAT: https://qat.redports.org/buildarchive/r346857/ Log: - remove WITH_OPENSSL_HACK7 Modified: head/Mk/bsd.openssl.mk Modified: head/Mk/bsd.openssl.mk ============================================================================== --- head/Mk/bsd.openssl.mk Mon Mar 3 04:30:59 2014 (r346856) +++ head/Mk/bsd.openssl.mk Mon Mar 3 05:43:38 2014 (r346857) @@ -8,7 +8,6 @@ # # WITH_OPENSSL_BASE=yes - Use the version in the base system. # WITH_OPENSSL_PORT=yes - Use the port, even if base is up to date -# WITH_OPENSSL_HACK7=yes - Use not the version in the base system on FreeBSD 7.x # # USE_OPENSSL_RPATH=yes - Pass RFLAGS options in CFLAGS, # needed for ports who don't use LDFLAGS @@ -40,13 +39,6 @@ WITH_OPENSSL_BASE=yes WITH_OPENSSL_PORT=yes .endif -.if defined(WITH_OPENSSL_HACK7) -.if ${OSVERSION} < 800000 -# the openssl in base of FreeBSD 7.x is too old -WITH_OPENSSL_PORT?= yes -.endif -.endif - # if no preference was set, check for an installed base version # but give an installed port preference over it. .if !defined(WITH_OPENSSL_BASE) && \ @@ -153,7 +145,7 @@ OPENSSLINC= ${OPENSSLBASE}/include .if defined(USE_OPENSSL_RPATH) CFLAGS+= -Wl,-rpath,${OPENSSLRPATH} .endif -OPENSSL_LDFLAGS+= -Wl,-rpath=${OPENSSLRPATH} +OPENSSL_LDFLAGS+= -Wl,-rpath,${OPENSSLRPATH} LDFLAGS+=${OPENSSL_LDFLAGS}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403030543.s235hcGi039227>