Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Feb 2014 00:14:32 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342226 - head/security/truecrypt
Message-ID:  <201402020014.s120EWX9044269@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Sun Feb  2 00:14:32 2014
New Revision: 342226
URL: http://svnweb.freebsd.org/changeset/ports/342226
QAT: https://qat.redports.org/buildarchive/r342226/

Log:
  - Fix build under 10.0
  - Switch wxWidgets archive format to bz2 for future upgrades
  - Bump PORTREVISION

Modified:
  head/security/truecrypt/Makefile
  head/security/truecrypt/distinfo

Modified: head/security/truecrypt/Makefile
==============================================================================
--- head/security/truecrypt/Makefile	Sun Feb  2 00:02:52 2014	(r342225)
+++ head/security/truecrypt/Makefile	Sun Feb  2 00:14:32 2014	(r342226)
@@ -3,16 +3,17 @@
 
 PORTNAME=	truecrypt
 PORTVERSION=	7.1a
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/wxwindows/${WX_VER}/:wxwidgets \
 		ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/:rsa \
 		http://mirrors.rit.edu/zi/pkcs-11/v2-20/:rsa
 DISTFILES=	${TC_SRCFILE}:tc \
-		wxWidgets-${WX_VER}.tar.gz:wxwidgets \
+		wxWidgets-${WX_VER}.tar.bz2:wxwidgets \
 		pkcs11.h:rsa \
 		pkcs11f.h:rsa \
 		pkcs11t.h:rsa
-EXTRACT_ONLY=	${TC_SRCFILE} wxWidgets-${WX_VER}.tar.gz
+EXTRACT_ONLY=	${TC_SRCFILE} wxWidgets-${WX_VER}.tar.bz2
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Free open-source disk encryption software
@@ -23,10 +24,12 @@ RUN_DEPENDS=	sudo:${PORTSDIR}/security/s
 WRKSRC=		${WRKDIR}/truecrypt-${PORTVERSION}-source
 
 USES=		fuse iconv pkgconfig
+USE_GCC=	any
 USE_GMAKE=	yes
 RESTRICTED=	Downloading requires acceptance of license agreement
 NO_CDROM=	Distribution requires acceptance of license agreement
 NO_PACKAGE=	Distribution requires acceptance of license agreement
+NO_STAGE=	yes
 
 TC_SRCFILE=	TrueCrypt_${PORTVERSION}_Source.tar.gz
 WX_VER=		2.8.12
@@ -38,7 +41,6 @@ PLIST_FILES=	bin/truecrypt
 OPTIONS_DEFINE=	X11 DOCS
 X11_DESC=	With GUI (depends on X)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -79,8 +81,10 @@ do-build:
 	@${CP} ${DISTDIR}/pkcs11.h ${WRKDIR}/rsa
 	@${CP} ${DISTDIR}/pkcs11t.h ${WRKDIR}/rsa
 	@${CP} ${DISTDIR}/pkcs11f.h ${WRKDIR}/rsa
-	cd ${WRKSRC} && ${GMAKE} ${NOGUI} PKCS11_INC=${WRKDIR}/rsa WX_ROOT=${WRKDIR}/wxWidgets-${WX_VER} wxbuild
-	cd ${WRKSRC} && ${GMAKE} ${NOGUI} WXSTATIC=1 PKCS11_INC=${WRKDIR}/rsa
+	@${ECHO_MSG} "===>  Building for wxWidgets dependency"
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${NOGUI} PKCS11_INC=${WRKDIR}/rsa WX_ROOT=${WRKDIR}/wxWidgets-${WX_VER} wxbuild)
+	@${ECHO_MSG} "===>  Building for ${PKGNAME}"
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${NOGUI} WXSTATIC=1 PKCS11_INC=${WRKDIR}/rsa)
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/Main/truecrypt ${PREFIX}/bin

Modified: head/security/truecrypt/distinfo
==============================================================================
--- head/security/truecrypt/distinfo	Sun Feb  2 00:02:52 2014	(r342225)
+++ head/security/truecrypt/distinfo	Sun Feb  2 00:14:32 2014	(r342226)
@@ -1,7 +1,7 @@
 SHA256 (TrueCrypt_7.1a_Source.tar.gz) = e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc
 SIZE (TrueCrypt_7.1a_Source.tar.gz) = 1949303
-SHA256 (wxWidgets-2.8.12.tar.gz) = 197c94f7d46269a7fc261a3c8c943f03a9807acf65381944489a538fd8b5dd21
-SIZE (wxWidgets-2.8.12.tar.gz) = 18924737
+SHA256 (wxWidgets-2.8.12.tar.bz2) = 3b0ac1d2d017683851841501c8e1b744b97242d684a1668ded61809b0504f707
+SIZE (wxWidgets-2.8.12.tar.bz2) = 13824774
 SHA256 (pkcs11.h) = 1563d877b6f8868b8eb8687358162bfb7f868104ed694beb35ae1c5cf1a58b9b
 SIZE (pkcs11.h) = 9578
 SHA256 (pkcs11f.h) = 5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402020014.s120EWX9044269>