svn commit: r331737 - in head/security: libotr libotr3

[Carlo Strub]

Author: cs
Date: Sat Oct 26 21:36:26 2013
New Revision: 331737
URL: http://svnweb.freebsd.org/changeset/ports/331737

Log:
  - security/libotr: update to new LIB_DEPENDS, adjust conflicts
  - security/libotr3: update to new LIB_DEPENDS, adjust conflicts, add staging support

Modified:
  head/security/libotr/Makefile
  head/security/libotr3/Makefile
  head/security/libotr3/pkg-descr
  head/security/libotr3/pkg-plist

Modified: head/security/libotr/Makefile
==============================================================================
--- head/security/libotr/Makefile	Sat Oct 26 21:33:23 2013	(r331736)
+++ head/security/libotr/Makefile	Sat Oct 26 21:36:26 2013	(r331737)
@@ -14,11 +14,13 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	cs at FreeBSD.org
 COMMENT=	Portable OTR Messaging Library and toolkit
 
+LICENSE=	LGPL21
+
 BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
-LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgpg-error.so:${PORTSDIR}/security/libgpg-error \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
-CONFLICTS=	libotr-3.*
+CONFLICTS=	libotr3-*
 
 USE_AUTOTOOLS=	autoconf libtool
 USE_LDCONFIG=	yes

Modified: head/security/libotr3/Makefile
==============================================================================
--- head/security/libotr3/Makefile	Sat Oct 26 21:33:23 2013	(r331736)
+++ head/security/libotr3/Makefile	Sat Oct 26 21:36:26 2013	(r331737)
@@ -6,36 +6,29 @@ PORTVERSION=	3.2.1
 # confirmed via testing that it is necessary
 PORTREVISION=	1
 CATEGORIES=	security net-im net
-MASTER_SITES=	http://www.cypherpunks.ca/otr/
+MASTER_SITES=	http://www.c-s.li/ports/ \
+		https://otr.cypherpunks.ca/
+PKGNAMESUFFIX=	3
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cs at FreeBSD.org
 COMMENT=	Portable OTR Messaging Library and toolkit
 
-BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
-LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+LICENSE=	LGPL21
 
+BUILD_DEPENDS=	pkgconf:${PORTSDIR}/devel/pkgconf
+LIB_DEPENDS=	libgpg-error.so:${PORTSDIR}/security/libgpg-error \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
-NO_LATEST_LINK=	yes
-CONFLICTS=	libotr-4.*
+CONFLICTS=	libotr-*
 
 USE_AUTOTOOLS=	autoconf libtool
 USE_LDCONFIG=	yes
 
-MAN1=		otr_toolkit.1
-MLINKS=		otr_toolkit.1 otr_parse.1 \
-		otr_toolkit.1 otr_sesskeys.1 \
-		otr_toolkit.1 otr_mackey.1 \
-		otr_toolkit.1 otr_readforge.1 \
-		otr_toolkit.1 otr_modify.1 \
-		otr_toolkit.1 otr_remac.1
-
 verify: checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's#^pkgconfigdir .*#pkgconfigdir = ${PREFIX}/libdata/pkgconfig#' \
 	    ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am

Modified: head/security/libotr3/pkg-descr
==============================================================================
--- head/security/libotr3/pkg-descr	Sat Oct 26 21:33:23 2013	(r331736)
+++ head/security/libotr3/pkg-descr	Sat Oct 26 21:36:26 2013	(r331737)
@@ -1,4 +1,4 @@
 This is the library and toolkit for Off-the-Record Messaging used by
 the pidgin-otr plugin.
 
-WWW: http://www.cypherpunks.ca/otr/
+WWW: https://otr.cypherpunks.ca/

Modified: head/security/libotr3/pkg-plist
==============================================================================
--- head/security/libotr3/pkg-plist	Sat Oct 26 21:33:23 2013	(r331736)
+++ head/security/libotr3/pkg-plist	Sat Oct 26 21:36:26 2013	(r331737)
@@ -23,5 +23,12 @@ lib/libotr.la
 lib/libotr.so
 lib/libotr.so.4
 libdata/pkgconfig/libotr.pc
+man/man1/otr_mackey.1.gz
+man/man1/otr_modify.1.gz
+man/man1/otr_parse.1.gz
+man/man1/otr_readforge.1.gz
+man/man1/otr_remac.1.gz
+man/man1/otr_sesskeys.1.gz
+man/man1/otr_toolkit.1.gz
 share/aclocal/libotr.m4
 @dirrm include/libotr