From owner-svn-ports-head@FreeBSD.ORG Tue May 20 19:56:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32EBA6AA; Tue, 20 May 2014 19:56:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06D472B42; Tue, 20 May 2014 19:56:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KJuFF7057243; Tue, 20 May 2014 19:56:15 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4KJuFqO057240; Tue, 20 May 2014 19:56:15 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201405201956.s4KJuFqO057240@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 20 May 2014 19:56:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354679 - head/security/libotr X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2014 19:56:16 -0000 Author: tijl Date: Tue May 20 19:56:15 2014 New Revision: 354679 URL: http://svnweb.freebsd.org/changeset/ports/354679 QAT: https://qat.redports.org/buildarchive/r354679/ Log: - Remove build dependency on pkgconf. - USES=libtool pathfix. - Reenable -fstack-protector. There was only ever a problem on FreeBSD i386 <10 which can be fixed by adding -lssp_nonshared to LDFLAGS like Mk/bsd.ssp.mk does. Approved by: cs (maintainer) Modified: head/security/libotr/Makefile head/security/libotr/pkg-plist Modified: head/security/libotr/Makefile ============================================================================== --- head/security/libotr/Makefile Tue May 20 19:54:23 2014 (r354678) +++ head/security/libotr/Makefile Tue May 20 19:56:15 2014 (r354679) @@ -2,9 +2,7 @@ PORTNAME= libotr PORTVERSION= 4.0.0 -# Please do not bump PORTREVISION for this port unless you have -# confirmed via testing that it is necessary -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net-im net MASTER_SITES= https://otr.cypherpunks.ca/ \ http://www.c-s.li/ports/ @@ -16,27 +14,22 @@ COMMENT= Portable OTR Messaging Library LICENSE= LGPL21 -BUILD_DEPENDS= pkgconf>0:${PORTSDIR}/devel/pkgconf LIB_DEPENDS= libgpg-error.so:${PORTSDIR}/security/libgpg-error \ libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFLICTS= libotr3-* -USE_AUTOTOOLS= autoconf libtool +GNU_CONFIGURE= yes +USES= libtool pathfix USE_LDCONFIG= yes -verify: checksum - gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc - -.include +.include -post-patch: - @${REINPLACE_CMD} -e 's#^pkgconfigdir .*#pkgconfigdir = ${PREFIX}/libdata/pkgconfig#' \ - ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am - -.if ${OSVERSION} >= 800000 && ${OSVERSION} < 1000000 - @${REINPLACE_CMD} -e 's#OTR_CHECK_CFLAGS(.*stack-protector.*#dnl &#' \ - ${WRKSRC}/configure.ac +.if ${OSVERSION} < 1000036 && ${ARCH} == i386 +LDFLAGS+= -lssp_nonshared .endif -.include +verify: checksum + gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc + +.include Modified: head/security/libotr/pkg-plist ============================================================================== --- head/security/libotr/pkg-plist Tue May 20 19:54:23 2014 (r354678) +++ head/security/libotr/pkg-plist Tue May 20 19:56:15 2014 (r354679) @@ -21,9 +21,9 @@ include/libotr/tlv.h include/libotr/userstate.h include/libotr/version.h lib/libotr.a -lib/libotr.la lib/libotr.so lib/libotr.so.5 +lib/libotr.so.5.0.0 libdata/pkgconfig/libotr.pc man/man1/otr_mackey.1.gz man/man1/otr_modify.1.gz