From owner-svn-ports-head@FreeBSD.ORG  Sun Jul 29 08:10:38 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E3956106564A;
	Sun, 29 Jul 2012 08:10:38 +0000 (UTC)
	(envelope-from dinoex@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B462F8FC12;
	Sun, 29 Jul 2012 08:10:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6T8AcYB025212;
	Sun, 29 Jul 2012 08:10:38 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6T8AchJ025210;
	Sun, 29 Jul 2012 08:10:38 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201207290810.q6T8AchJ025210@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 29 Jul 2012 08:10:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301677 - head/security/openssl
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Jul 2012 08:10:39 -0000

Author: dinoex
Date: Sun Jul 29 08:10:38 2012
New Revision: 301677
URL: http://svn.freebsd.org/changeset/ports/301677

Log:
  - fix option THREADS
  - bump PORTREVISION
  PR:		170231
  Submitted by:	Kubilay Kocak

Modified:
  head/security/openssl/Makefile

Modified: head/security/openssl/Makefile
==============================================================================
--- head/security/openssl/Makefile	Sun Jul 29 08:01:59 2012	(r301676)
+++ head/security/openssl/Makefile	Sun Jul 29 08:10:38 2012	(r301677)
@@ -8,7 +8,7 @@
 PORTNAME=	openssl
 PORTVERSION=	1.0.1
 DISTVERSIONSUFFIX=	c
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/%SUBDIR%/ \
 		ftp://ftp.openssl.org/%SUBDIR%/ \
@@ -1105,17 +1105,17 @@ PLIST_SUB+=	WITH_RC5="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPADLOCK}
-PATCH_DIST_STRIP= -p1
-PATCH_SITES+= http://git.alpinelinux.org/cgit/aports/plain/main/openssl/:padlock
-PATCHFILES+= 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch:padlock \
-0003-engines-e_padlock-backport-cvs-head-changes.patch:padlock \
-0004-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch:padlock \
-0005-crypto-engine-autoload-padlock-dynamic-engine.patch:padlock
+PATCH_DIST_STRIP=	-p1
+PATCH_SITES+=	http://git.alpinelinux.org/cgit/aports/plain/main/openssl/:padlock
+PATCHFILES+=	0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch:padlock \
+		0003-engines-e_padlock-backport-cvs-head-changes.patch:padlock \
+		0004-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch:padlock \
+		0005-crypto-engine-autoload-padlock-dynamic-engine.patch:padlock
 .endif
 
 .if ${PORT_OPTIONS:MGMP}
 EXTRACONFIGURE+=	enable-gmp
-IGNORE=		GMP is LGPLv3 an can not be linked.
+IGNORE=	GMP is LGPLv3 and can not be linked
 .else
 EXTRACONFIGURE+=	no-gmp
 .endif
@@ -1146,15 +1146,16 @@ post-patch:
 do-configure:
 	@${REINPLACE_CMD} -e "s|options 386|options|" \
 		${WRKSRC}/config
+
 .if ${PORT_OPTIONS:MTHREADS}
 	cd ${WRKSRC} \
 	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
+		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
 	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
 		-L${PREFIX}/lib ${EXTRACONFIGURE}
 .else
 	cd ${WRKSRC} \
 	&& ${SETENV} CC="${CC}" FREEBSDCC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \
-		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
 	./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \
 		-L${PREFIX}/lib ${EXTRACONFIGURE}
 .endif