svn commit: r354679 - head/security/libotr

[Tijl Coosemans]

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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-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 <bsd.port.post.mk>
+verify: checksum
+	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
+
+.include <bsd.port.mk>

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