Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2013 22:41:43 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r326848 - in head/net/hupnp: . files
Message-ID:  <201309092241.r89MfhXq079239@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Mon Sep  9 22:41:43 2013
New Revision: 326848
URL: http://svnweb.freebsd.org/changeset/ports/326848

Log:
  - Fix the build with clang and libc++.
  - Point to the new domain in WWW.
  - Convert Makefile header.
  - Get rid of files/patch-herqq.pro by passing the proper arguments in
    QMAKE_ARGS.
  
  fluffy is usually responsive to PRs, but I ended up asking bapt for an
  approval here because hupnp is a dependency of kdelibs4 and I want to reduce
  the likelihood of an avalanche of PRs and complaints about KDE4 not building
  on -CURRENT (there are other ports to fix, though).
  
  PR:		ports/181974
  Approved by:	portmgr (bapt)

Deleted:
  head/net/hupnp/files/patch-herqq.pro
Modified:
  head/net/hupnp/Makefile
  head/net/hupnp/files/patch-hmulticast_socket.cpp
  head/net/hupnp/pkg-descr

Modified: head/net/hupnp/Makefile
==============================================================================
--- head/net/hupnp/Makefile	Mon Sep  9 22:30:03 2013	(r326847)
+++ head/net/hupnp/Makefile	Mon Sep  9 22:41:43 2013	(r326848)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	hupnp
-# Date created:				2010-12-29
-# Whom:					Dima Panov <fluffy@FreeBSD.org>
-#
+# Created by: Dima Panov <fluffy@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	hupnp
@@ -18,7 +15,7 @@ USE_ZIP=	yes
 USE_GMAKE=	yes
 USE_QT4=	corelib network xml dbus gui \
 		qmake_build moc_build rcc_build uic_build
-QMAKE_ARGS=	PREFIX=${PREFIX} herqq.pro
+QMAKE_ARGS=	PREFIX=${PREFIX} "CONFIG+=DISABLE_AVTESTAPP DISABLE_TESTAPP" herqq.pro
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}

Modified: head/net/hupnp/files/patch-hmulticast_socket.cpp
==============================================================================
--- head/net/hupnp/files/patch-hmulticast_socket.cpp	Mon Sep  9 22:30:03 2013	(r326847)
+++ head/net/hupnp/files/patch-hmulticast_socket.cpp	Mon Sep  9 22:41:43 2013	(r326848)
@@ -1,8 +1,10 @@
---- ./hupnp/src/socket/hmulticast_socket.cpp.orig	2011-03-28 00:42:32.000000000 +1100
-+++ ./hupnp/src/socket/hmulticast_socket.cpp	2011-08-08 11:59:59.868629425 +1100
-@@ -27,6 +27,8 @@
+--- ./hupnp/src/socket/hmulticast_socket.cpp.orig	2011-03-28 00:42:32.000000000 +0300
++++ ./hupnp/src/socket/hmulticast_socket.cpp	2013-09-10 00:35:26.000000000 +0300
+@@ -26,7 +26,10 @@
+ #include <winsock2.h>
  #include <ws2tcpip.h>
  #else
++#include <sys/types.h>
  #include <arpa/inet.h>
 +#include <netinet/in.h>
 +#include <sys/socket.h>

Modified: head/net/hupnp/pkg-descr
==============================================================================
--- head/net/hupnp/pkg-descr	Mon Sep  9 22:30:03 2013	(r326847)
+++ head/net/hupnp/pkg-descr	Mon Sep  9 22:41:43 2013	(r326848)
@@ -1,4 +1,4 @@
 Herqq UPnP (HUPnP) is a software library for building UPnP devices and control
 points conforming to the UPnP Device Architecture version 1.1.
 
-WWW: http://www.herqq.org/
+WWW: http://hupnp.linada.fi/



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