Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jan 2014 12:27:30 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340030 - in head/net-im/gloox: . files
Message-ID:  <201401171227.s0HCRU8C066127@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Fri Jan 17 12:27:30 2014
New Revision: 340030
URL: http://svnweb.freebsd.org/changeset/ports/340030
QAT: https://qat.redports.org/buildarchive/r340030/

Log:
  - Fix build on head/10
  - Support staging
  - Use new LIB_DEPENDS format
  - Unsilence post-install commands

Added:
  head/net-im/gloox/files/
  head/net-im/gloox/files/patch-src-examples-bosh_example.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src-examples-e2ee_client.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src-examples-e2ee_server.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src-examples-ft_recv.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src-examples-ft_send.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src-examples-message_example.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src-examples-pubsub_example.cpp   (contents, props changed)
  head/net-im/gloox/files/patch-src-util.h   (contents, props changed)
Modified:
  head/net-im/gloox/Makefile   (contents, props changed)

Modified: head/net-im/gloox/Makefile
==============================================================================
--- head/net-im/gloox/Makefile	Fri Jan 17 12:22:13 2014	(r340029)
+++ head/net-im/gloox/Makefile	Fri Jan 17 12:27:30 2014	(r340030)
@@ -10,8 +10,8 @@ MASTER_SITES=	http://camaya.net/download
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jabber/XMPP client library
 
-LIB_DEPENDS=	idn.17:${PORTSDIR}/dns/libidn \
-		gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
+		libgnutls.so:${PORTSDIR}/security/gnutls
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
@@ -21,13 +21,13 @@ CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/in
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|' ${WRKSRC}/configure
+
 post-install:
-	@${FIND} ${PREFIX}/include/gloox ! -type d | \
-		${SED} "s,${PREFIX}/,," >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/include/gloox -type d | ${SORT} -r | \
-		${SED} "s,${PREFIX}/,@dirrm ," >> ${TMPPLIST}
+	${FIND} ${STAGEDIR}${PREFIX}/include/gloox ! -type d | \
+		${SED} "s,${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
+	${FIND} ${STAGEDIR}${PREFIX}/include/gloox -type d | ${SORT} -r | \
+		${SED} "s,${STAGEDIR}${PREFIX}/,@dirrm ," >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Added: head/net-im/gloox/files/patch-src-examples-bosh_example.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src-examples-bosh_example.cpp	Fri Jan 17 12:27:30 2014	(r340030)
@@ -0,0 +1,10 @@
+--- src/examples/bosh_example.cpp.orig	2009-06-22 11:39:04.000000000 +0200
++++ src/examples/bosh_example.cpp	2013-12-26 22:57:50.576228531 +0100
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string>
++#include <ctime>
+ 
+ #include <cstdio> // [s]print[f]
+ 

Added: head/net-im/gloox/files/patch-src-examples-e2ee_client.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src-examples-e2ee_client.cpp	Fri Jan 17 12:27:30 2014	(r340030)
@@ -0,0 +1,10 @@
+--- src/examples/e2ee_client.cpp.orig	2009-10-13 20:57:34.000000000 +0200
++++ src/examples/e2ee_client.cpp	2013-12-26 22:57:55.817222888 +0100
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <locale.h>
+ #include <string>
++#include <ctime>
+ 
+ #include <cstdio> // [s]print[f]
+ 

Added: head/net-im/gloox/files/patch-src-examples-e2ee_server.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src-examples-e2ee_server.cpp	Fri Jan 17 12:27:30 2014	(r340030)
@@ -0,0 +1,10 @@
+--- src/examples/e2ee_server.cpp.orig	2009-10-13 20:47:21.000000000 +0200
++++ src/examples/e2ee_server.cpp	2013-12-26 22:58:00.534218841 +0100
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <locale.h>
+ #include <string>
++#include <ctime>
+ 
+ #include <cstdio> // [s]print[f]
+ 

Added: head/net-im/gloox/files/patch-src-examples-ft_recv.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src-examples-ft_recv.cpp	Fri Jan 17 12:27:30 2014	(r340030)
@@ -0,0 +1,10 @@
+--- src/examples/ft_recv.cpp.orig	2009-10-06 15:14:26.000000000 +0200
++++ src/examples/ft_recv.cpp	2013-12-26 22:58:05.182220399 +0100
+@@ -13,6 +13,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string>
++#include <ctime>
+ 
+ #include <cstdio> // [s]print[f]
+ 

Added: head/net-im/gloox/files/patch-src-examples-ft_send.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src-examples-ft_send.cpp	Fri Jan 17 12:27:30 2014	(r340030)
@@ -0,0 +1,10 @@
+--- src/examples/ft_send.cpp.orig	2009-10-06 15:15:09.000000000 +0200
++++ src/examples/ft_send.cpp	2013-12-26 22:58:11.944229970 +0100
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string>
++#include <ctime>
+ #include <fstream>
+ #include <ios>
+ 

Added: head/net-im/gloox/files/patch-src-examples-message_example.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src-examples-message_example.cpp	Fri Jan 17 12:27:30 2014	(r340030)
@@ -0,0 +1,10 @@
+--- src/examples/message_example.cpp.orig	2009-10-26 00:34:48.000000000 +0100
++++ src/examples/message_example.cpp	2013-12-26 22:58:16.855221562 +0100
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <string>
++#include <ctime>
+ 
+ #include <cstdio> // [s]print[f]
+ 

Added: head/net-im/gloox/files/patch-src-examples-pubsub_example.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src-examples-pubsub_example.cpp	Fri Jan 17 12:27:30 2014	(r340030)
@@ -0,0 +1,10 @@
+--- src/examples/pubsub_example.cpp.orig	2009-06-22 11:35:17.000000000 +0200
++++ src/examples/pubsub_example.cpp	2013-12-26 22:58:22.252225373 +0100
+@@ -22,6 +22,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string>
++#include <ctime>
+ 
+ #if defined( WIN32 ) || defined( _WIN32 )
+ # include <windows.h>

Added: head/net-im/gloox/files/patch-src-util.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/gloox/files/patch-src-util.h	Fri Jan 17 12:27:30 2014	(r340030)
@@ -0,0 +1,10 @@
+--- src/util.h.orig	2009-10-30 18:47:43.000000000 +0100
++++ src/util.h	2013-12-26 21:42:43.366548503 +0100
+@@ -16,6 +16,7 @@
+ #include "gloox.h"
+ 
+ #include <cmath>
++#include <cstdlib>
+ #include <algorithm>
+ #include <string>
+ #include <list>



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