Date: Thu, 16 Jun 2005 21:02:56 -0400 (EDT) From: Charles Swiger <chuck@pkix.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: leeym@FreeBSD.org, Chris Martin <outsidefactor@iinet.net.au> Subject: ports/82347: update port: devel/upnp to v1.2.1 Message-ID: <20050617010256.1A6CB54C8@pkix-gw.codefab.com> Resent-Message-ID: <200506170110.j5H1AIke066923@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82347
>Category: ports
>Synopsis: update port: devel/upnp to v1.2.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 17 01:10:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Charles Swiger
>Release: FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD ns1.pkix.net 4.11-STABLE FreeBSD 4.11-STABLE #3: Tue Apr 5 00:29:47 EDT 2005 root@ns1.pkix.net:/usr/obj/usr/src/sys/NORMAL i386
>Description:
Update devel/upnp port to the latest version. CC:'ing maintainer and person
requesting the update. Note that much of the path layout within the tarball
have changed, so the former set of patches didn't really correspond and the
diff below was made as if the prior version had an empty files directory.
>How-To-Repeat:
N/A.
>Fix:
diff -durP upnp.orig/Makefile upnp/Makefile
--- upnp.orig/Makefile Thu Jun 16 19:11:02 2005
+++ upnp/Makefile Thu Jun 16 20:50:25 2005
@@ -6,19 +6,19 @@
#
PORTNAME= upnp
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.2.1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}sdk-${PORTVERSION}
+DISTNAME= lib${PORTNAME}-${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
COMMENT= Universal Plug and Play Software Development Kit
LIB_DEPENDS= uuid.1:${PORTSDIR}/sysutils/e2fsprogs
+WRKSRC= ${WRKDIR}/${DISTNAME}/upnp
USE_GMAKE= yes
USE_REINPLACE= yes
MAKEFILE= makefile
@@ -27,16 +27,19 @@
INSTALLS_SHLIB= yes
post-patch:
- @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MAKE = make,MAKE = ${GMAKE},' \
+ cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MAKE = make,MAKE = ${GMAKE},' \
src/genlib/makefile src/makefile
- @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
- src/inc/genlib/client_table/client_table.h \
- src/inc/genlib/http_client/http_client.h \
- src/inc/genlib/service_table/service_table.h \
- src/inc/genlib/timer_thread/timer_thread.h \
- src/upnpdom/domCif.cpp
- @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MSG_NOSIGNAL,0,' \
- src/genlib/http_client/http_client.c \
- src/genlib/net/http/readwrite.cpp
+ cd ${WRKSRC}/.. && ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
+ ixml/inc/ixml.h \
+ threadutil/inc/FreeList.h \
+ threadutil/src/LinkedList.c \
+ threadutil/src/iasnprintf.c \
+ upnp/src/genlib/util/upnp_timeout.c \
+ upnp/src/inc/client_table.h \
+ upnp/src/inc/http_client.h \
+ upnp/src/inc/service_table.h \
+ upnp/src/inc/uri.h
+ cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,MSG_NOSIGNAL,0,' \
+ src/genlib/net/sock.c
.include <bsd.port.mk>
diff -durP upnp.orig/distinfo upnp/distinfo
--- upnp.orig/distinfo Thu Jun 16 20:52:40 2005
+++ upnp/distinfo Thu Jun 16 18:59:09 2005
@@ -1,2 +1,2 @@
-MD5 (upnpsdk-1.0.4.tar.gz) = d4ebd84d0c809d90ae36c37e5a2d213c
-SIZE (upnpsdk-1.0.4.tar.gz) = 227425
+MD5 (libupnp-1.2.1.tar.gz) = 14b453406c0f768f875de50bdbf5c802
+SIZE (libupnp-1.2.1.tar.gz) = 412314
diff -durP upnp.orig/files/patch-makefile upnp/files/patch-makefile
--- upnp.orig/files/patch-makefile Wed Dec 31 19:00:00 1969
+++ upnp/files/patch-makefile Thu Jun 16 20:39:06 2005
@@ -0,0 +1,45 @@
+--- makefile~ Thu Jun 16 20:34:51 2005
++++ makefile Thu Jun 16 20:38:42 2005
+@@ -171,27 +171,27 @@
+ @$(MAKE) -C $(THREADUTIL_DIR) clean
+
+ install: upnp
+- @if [ ! -d $(PREFIX)/usr/include/upnp ]; then \
+- install -d $(PREFIX)/usr/include/upnp; \
++ @if [ ! -d $(PREFIX)/include/upnp ]; then \
++ install -d $(PREFIX)/include/upnp; \
+ fi
+- @if [ ! -d $(PREFIX)/usr/lib ]; then \
+- install -d $(PREFIX)/usr/lib; \
++ @if [ ! -d $(PREFIX)/lib ]; then \
++ install -d $(PREFIX)/lib; \
+ fi
+ @if [ -f bin/$(DIR_PATH)upnp.jar ]; then \
+- install bin/$(DIR_PATH)upnp.jar $(PREFIX)/usr/lib; \
++ install bin/$(DIR_PATH)upnp.jar $(PREFIX)lib; \
+ fi
+- @install bin/$(DIR_PATH)libupnp.so $(PREFIX)/usr/lib/libupnp.so.$(VERSION)
+- @ln -s $(PREFIX)/usr/lib/libupnp.so.$(VERSION) $(PREFIX)/usr/lib/libupnp.so
+- @install inc/upnp.h $(PREFIX)/usr/include/upnp
+- @install inc/config.h $(PREFIX)/usr/include/upnp
+- @install inc/upnptools.h $(PREFIX)/usr/include/upnp
++ @install bin/$(DIR_PATH)libupnp.so $(PREFIX)/lib/libupnp.so.$(VERSION)
++ @ln -s $(PREFIX)/lib/libupnp.so.$(VERSION) $(PREFIX)/lib/libupnp.so
++ @install inc/upnp.h $(PREFIX)/include/upnp
++ @install inc/config.h $(PREFIX)/include/upnp
++ @install inc/upnptools.h $(PREFIX)/include/upnp
+
+ uninstall:
+- @rm -f $(PREFIX)/usr/include/upnp/upnp.h
+- @rm -f $(PREFIX)/usr/include/upnp/config.h
+- @rm -f $(PREFIX)/usr/include/upnp/upnptools.h
+- @rm -f $(PREFIX)/usr/lib/libupnp.so
+- @rm -f $(PREFIX)/usr/lib/libupnp.so.$(VERSION)
++ @rm -f $(PREFIX)/include/upnp/upnp.h
++ @rm -f $(PREFIX)/include/upnp/config.h
++ @rm -f $(PREFIX)/include/upnp/upnptools.h
++ @rm -f $(PREFIX)/lib/libupnp.so
++ @rm -f $(PREFIX)/lib/libupnp.so.$(VERSION)
+
+ test: upnp
+ if [ ! -d bin/tests ]; then mkdir -p bin/tests ; fi
diff -durP upnp.orig/files/patch-src::api::upnpapi.c upnp/files/patch-src::api::upnpapi.c
--- upnp.orig/files/patch-src::api::upnpapi.c Wed Dec 31 19:00:00 1969
+++ upnp/files/patch-src::api::upnpapi.c Thu Jun 16 20:23:02 2005
@@ -0,0 +1,11 @@
+--- src/api/upnpapi.c~ Wed Jan 15 16:39:43 2003
++++ src/api/upnpapi.c Thu Jun 16 20:22:33 2005
+@@ -43,7 +43,7 @@
+ #include "ThreadPool.h"
+ #include "membuffer.h"
+ #include <sys/ioctl.h>
+-#include <linux/if.h>
++#include <net/if.h>
+ #include <sys/utsname.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff -durP upnp.orig/files/patch-src::urlconfig::urlconfig.c upnp/files/patch-src::urlconfig::urlconfig.c
--- upnp.orig/files/patch-src::urlconfig::urlconfig.c Wed Dec 31 19:00:00 1969
+++ upnp/files/patch-src::urlconfig::urlconfig.c Thu Jun 16 20:19:07 2005
@@ -0,0 +1,10 @@
+--- src/urlconfig/urlconfig.c~ Wed Jan 15 16:39:44 2003
++++ src/urlconfig/urlconfig.c Thu Jun 16 20:18:35 2005
+@@ -30,6 +30,7 @@
+ ///////////////////////////////////////////////////////////////////////////
+
+ #include <assert.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff -durP upnp.orig/files/patch-src::uuid::sysdep.c upnp/files/patch-src::uuid::sysdep.c
--- upnp.orig/files/patch-src::uuid::sysdep.c Wed Dec 31 19:00:00 1969
+++ upnp/files/patch-src::uuid::sysdep.c Thu Jun 16 20:29:19 2005
@@ -0,0 +1,10 @@
+--- src/uuid/sysdep.c~ Wed Jan 15 16:39:44 2003
++++ src/uuid/sysdep.c Thu Jun 16 20:27:20 2005
+@@ -144,7 +144,6 @@
+ {
+ MD5_CTX c;
+ typedef struct {
+- struct sysinfo s;
+ struct timeval t;
+ char hostname[257];
+ } randomness;
diff -durP upnp.orig/files/patch-src::uuid::uuid.c upnp/files/patch-src::uuid::uuid.c
--- upnp.orig/files/patch-src::uuid::uuid.c Wed Dec 31 19:00:00 1969
+++ upnp/files/patch-src::uuid::uuid.c Thu Jun 16 20:28:08 2005
@@ -0,0 +1,10 @@
+--- src/uuid/uuid.c~ Wed Jan 15 16:39:44 2003
++++ src/uuid/uuid.c Thu Jun 16 20:25:44 2005
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include "sysdep.h"
+ #include "uuid.h"
diff -durP upnp.orig/files/patch-threadutil::src::Makefile upnp/files/patch-threadutil::src::Makefile
--- upnp.orig/files/patch-threadutil::src::Makefile Wed Dec 31 19:00:00 1969
+++ upnp/files/patch-threadutil::src::Makefile Thu Jun 16 20:11:50 2005
@@ -0,0 +1,11 @@
+--- ../threadutil/src/Makefile~ Tue Jan 14 17:06:12 2003
++++ ../threadutil/src/Makefile Thu Jun 16 20:02:35 2005
+@@ -92,7 +92,7 @@
+ $(OBJ_DIR)TimerThread.o \
+ $(OBJ_DIR)iasnprintf.o
+
+-libthreadutil.so_libs = -lpthread
++libthreadutil.so_libs =
+
+ ifeq ($(EFENCE),1)
+ libthreadutil.so_libs += -lefence
diff -durP upnp.orig/files/patch-threadutil::src::ThreadPool.c upnp/files/patch-threadutil::src::ThreadPool.c
--- upnp.orig/files/patch-threadutil::src::ThreadPool.c Wed Dec 31 19:00:00 1969
+++ upnp/files/patch-threadutil::src::ThreadPool.c Thu Jun 16 20:12:04 2005
@@ -0,0 +1,40 @@
+--- ../threadutil/src/ThreadPool.c.orig Thu Jun 16 19:24:43 2005
++++ ../threadutil/src/ThreadPool.c Thu Jun 16 19:29:53 2005
+@@ -341,7 +341,7 @@
+ struct timeb t;
+
+ ftime( &t );
+- srand( ( unsigned int )t.millitm + ithread_get_current_thread_id( ) );
++ srand(t.millitm);
+ }
+
+
+@@ -1457,13 +1457,13 @@
+
+ printf( "ThreadPoolStats at Time: %ld\n", time( NULL ) );
+ printf
+- ( "Average Wait in High Priority Q in milliseconds: %lf\n",
++ ( "Average Wait in High Priority Q in milliseconds: %f\n",
+ stats->avgWaitHQ );
+ printf
+- ( "Average Wait in Med Priority Q in milliseconds: %lf\n",
++ ( "Average Wait in Med Priority Q in milliseconds: %f\n",
+ stats->avgWaitMQ );
+ printf
+- ( "Averate Wait in Low Priority Q in milliseconds: %lf\n",
++ ( "Averate Wait in Low Priority Q in milliseconds: %f\n",
+ stats->avgWaitLQ );
+ printf( "Max Threads Active: %d\n", stats->maxThreads );
+ printf( "Current Worker Threads: %d\n",
+@@ -1472,9 +1472,9 @@
+ stats->persistentThreads );
+ printf( "Current Idle Threads: %d\n", stats->idleThreads );
+ printf( "Total Threads : %d\n", stats->totalThreads );
+- printf( "Total Time spent Working in seconds: %lf\n",
++ printf( "Total Time spent Working in seconds: %f\n",
+ stats->totalWorkTime );
+- printf( "Total Time spent Idle in seconds : %lf\n",
++ printf( "Total Time spent Idle in seconds : %f\n",
+ stats->totalIdleTime );}
+ )
+
diff -durP upnp.orig/files/patch-upnp::src::inc::sysdep.h upnp/files/patch-upnp::src::inc::sysdep.h
--- upnp.orig/files/patch-upnp::src::inc::sysdep.h Wed Dec 31 19:00:00 1969
+++ upnp/files/patch-upnp::src::inc::sysdep.h Thu Jun 16 20:15:28 2005
@@ -0,0 +1,10 @@
+--- src/inc/sysdep.h~ Tue Jan 14 18:57:19 2003
++++ src/inc/sysdep.h Thu Jun 16 20:14:19 2005
+@@ -19,7 +19,6 @@
+
+ #include <sys/types.h>
+ #include <sys/time.h>
+-#include <sys/sysinfo.h>
+ #include "ithread.h"
+
+ /* change to point to where MD5 .h's live */
diff -durP upnp.orig/pkg-plist upnp/pkg-plist
--- upnp.orig/pkg-plist Thu Jun 16 18:56:10 2005
+++ upnp/pkg-plist Thu Jun 16 20:47:38 2005
@@ -1,19 +1,6 @@
-include/upnp/tools/config.h
-include/upnp/tools/upnptools.h
+include/upnp/config.h
+include/upnp/upnptools.h
include/upnp/upnp.h
-include/upnp/upnpdom/Attr.h
-include/upnp/upnpdom/DOMException.h
-include/upnp/upnpdom/Document.h
-include/upnp/upnpdom/Element.h
-include/upnp/upnpdom/NamedNodeMap.h
-include/upnp/upnpdom/Node.h
-include/upnp/upnpdom/NodeAct.h
-include/upnp/upnpdom/NodeList.h
-include/upnp/upnpdom/Parser.h
-include/upnp/upnpdom/all.h
-include/upnp/upnpdom/domCif.h
lib/libupnp.so
-lib/libupnp.so.1
-@dirrm include/upnp/upnpdom
-@dirrm include/upnp/tools
+lib/libupnp.so.1.2.1
@dirrm include/upnp
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050617010256.1A6CB54C8>