From 29e5ad827b482d4d7c5f430426490604f53e8a60 Mon Sep 17 00:00:00 2001 From: leeym Date: Sat, 11 Aug 2007 18:58:32 +0000 Subject: - remove devel/upnp104, which is obsoleted by devel/upnp --- CVSROOT/modules | 1 - MOVED | 1 + devel/Makefile | 1 - devel/upnp104/Makefile | 44 --------------------- devel/upnp104/distinfo | 3 -- devel/upnp104/files/patch-makefile | 45 ---------------------- devel/upnp104/files/patch-src::api::makefile | 22 ----------- devel/upnp104/files/patch-src::api::upnpapi.c | 11 ------ devel/upnp104/files/patch-src::gena::Makefile | 11 ------ .../files/patch-src::genlib::tpool::interrupts.cpp | 11 ------ .../files/patch-src::genlib::util::gmtdate.cpp | 20 ---------- devel/upnp104/files/patch-src::ssdp::ssdplib.c | 11 ------ devel/upnp104/pkg-descr | 18 --------- devel/upnp104/pkg-plist | 19 --------- 14 files changed, 1 insertion(+), 217 deletions(-) delete mode 100644 devel/upnp104/Makefile delete mode 100644 devel/upnp104/distinfo delete mode 100644 devel/upnp104/files/patch-makefile delete mode 100644 devel/upnp104/files/patch-src::api::makefile delete mode 100644 devel/upnp104/files/patch-src::api::upnpapi.c delete mode 100644 devel/upnp104/files/patch-src::gena::Makefile delete mode 100644 devel/upnp104/files/patch-src::genlib::tpool::interrupts.cpp delete mode 100644 devel/upnp104/files/patch-src::genlib::util::gmtdate.cpp delete mode 100644 devel/upnp104/files/patch-src::ssdp::ssdplib.c delete mode 100644 devel/upnp104/pkg-descr delete mode 100644 devel/upnp104/pkg-plist diff --git a/CVSROOT/modules b/CVSROOT/modules index 9108d61131f9..0ee78662b914 100644 --- a/CVSROOT/modules +++ b/CVSROOT/modules @@ -15863,7 +15863,6 @@ upclient ports/misc/upclient updatedd ports/dns/updatedd uplog ports/net/uplog upnp ports/devel/upnp -upnp104 ports/devel/upnp104 upp ports/devel/upp uppaal ports/devel/uppaal uppc-kmod ports/palm/uppc-kmod diff --git a/MOVED b/MOVED index 70489cf96fe2..f0fbb3940cfe 100644 --- a/MOVED +++ b/MOVED @@ -3150,3 +3150,4 @@ net/p5-RRD-Simple|databases/p5-RRD-Simple|2007-08-11|Moved to a more appropriate net/php4-rrdtool|databases/php4-rrdtool|2007-08-11|Moved to a more appropriate category net/py-rrdtool_lgpl|databases/py-rrdtool_lgpl|2007-08-11|Moved to a more appropriate category games/gpuzzle|games/jigsaw|2007-08-11|Project renamed +devel/upnp104||2007-08-12|Removed diff --git a/devel/Makefile b/devel/Makefile index caabdf51740f..8cdb78298c67 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -2230,7 +2230,6 @@ SUBDIR += udis86 SUBDIR += umem SUBDIR += upnp - SUBDIR += upnp104 SUBDIR += upp SUBDIR += uppaal SUBDIR += ustl diff --git a/devel/upnp104/Makefile b/devel/upnp104/Makefile deleted file mode 100644 index 29c1807a212f..000000000000 --- a/devel/upnp104/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# New ports collection makefile for: upnp -# Date created: 02 August 2002 -# Whom: Yen-Ming Lee -# -# $FreeBSD$ -# - -PORTNAME= upnp -PORTVERSION= 1.0.4 -PORTREVISION= 2 -PORTEPOCH= 1 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}sdk-${PORTVERSION} - -MAINTAINER= leeym@FreeBSD.org -COMMENT= Universal Plug and Play Software Development Kit - -LIB_DEPENDS= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid - -CONFLICTS= upnp-1.[^0].* -LATEST_LINK= upnp104 - -USE_GMAKE= yes -MAKEFILE= makefile -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} -NOT_FOR_ARCHS= sparc64 -INSTALLS_SHLIB= yes - -post-patch: - @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 - -.include diff --git a/devel/upnp104/distinfo b/devel/upnp104/distinfo deleted file mode 100644 index 38cb9531818c..000000000000 --- a/devel/upnp104/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (upnpsdk-1.0.4.tar.gz) = d4ebd84d0c809d90ae36c37e5a2d213c -SHA256 (upnpsdk-1.0.4.tar.gz) = 8914b1037b8932ff575bd2715875dc9f87109385902eb7111844a74c7c1b12ef -SIZE (upnpsdk-1.0.4.tar.gz) = 227425 diff --git a/devel/upnp104/files/patch-makefile b/devel/upnp104/files/patch-makefile deleted file mode 100644 index 9482ec00fa36..000000000000 --- a/devel/upnp104/files/patch-makefile +++ /dev/null @@ -1,45 +0,0 @@ ---- makefile.orig Thu Aug 16 02:20:11 2001 -+++ makefile Sat Aug 3 17:22:35 2002 -@@ -29,11 +29,11 @@ - ## - ########################################################################### - --MAKE = make -+MAKE = gmake - UPNP = bin/libupnp.so - SUBDIRS = src - --VERSION=1.0.4 -+VERSION=1 - - ifeq ($(DEBUG),1) - STRIPU = -@@ -102,17 +102,17 @@ - @if [ -f "doc/upnpsdk.aux" ]; then rm doc/upnpsdk.aux; fi - - install: upnp -- @install -d /usr/include/upnp -- @install -d /usr/include/upnp/upnpdom -- @install -d /usr/include/upnp/tools -- @install bin/libupnp.so /usr/lib/libupnp.so.$(VERSION) -- ln -s /usr/lib/libupnp.so.$(VERSION) /usr/lib/libupnp.so -- @install inc/*.h /usr/include/upnp -- @install inc/upnpdom/*.h /usr/include/upnp/upnpdom -- @install inc/tools/*.h /usr/include/upnp/tools -+ @install -d ${PREFIX}/include/upnp -+ @install -d ${PREFIX}/include/upnp/upnpdom -+ @install -d ${PREFIX}/include/upnp/tools -+ @install bin/libupnp.so ${PREFIX}/lib/libupnp.so.$(VERSION) -+ ln -fs ${PREFIX}/lib/libupnp.so.$(VERSION) ${PREFIX}/lib/libupnp.so -+ @install inc/*.h ${PREFIX}/include/upnp -+ @install inc/upnpdom/*.h ${PREFIX}/include/upnp/upnpdom -+ @install inc/tools/*.h ${PREFIX}/include/upnp/tools - - uninstall: -- @if [ -d /usr/include/upnp ]; then rm -rf /usr/include/upnp; fi -- @if [ -f /usr/lib/libupnp.so ]; then rm /usr/lib/libupnp.so; fi -- @if [ -f /usr/lib/libupnp.so.$(VERSION) ]; then rm /usr/lib/libupnp.so.$(VERSION); fi -+ @if [ -d ${PREFIX}/include/upnp ]; then rm -rf ${PREFIX}/include/upnp; fi -+ @if [ -f ${PREFIX}/lib/libupnp.so ]; then rm ${PREFIX}/lib/libupnp.so; fi -+ @if [ -f ${PREFIX}/lib/libupnp.so.$(VERSION) ]; then rm ${PREFIX}/lib/libupnp.so.$(VERSION); fi - diff --git a/devel/upnp104/files/patch-src::api::makefile b/devel/upnp104/files/patch-src::api::makefile deleted file mode 100644 index 6e45724c5e35..000000000000 --- a/devel/upnp104/files/patch-src::api::makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- src/api/makefile.orig Fri Jun 15 08:21:33 2001 -+++ src/api/makefile Sat Aug 3 16:29:38 2002 -@@ -34,15 +34,15 @@ - CC = gcc - CFLAGS = -Wall -fpic $(DEFS) - C2FLAGS = -Wall $(DEFS) -shared -Wl,-soname,libupnp.so --INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools --LIBS = -lpthread -luuid -+INCLUDES = -I ../inc -I ../../inc -I ../../inc/upnpdom -I ../inc/tools -I $(LOCALBASE)/include -+LIBS = ${PTHREAD_LIBS} -luuid -L$(LOCALBASE)/lib - - ifeq ($(DEBUG),1) - CFLAGS += -g -O -DDEBUG - C2FLAGS += -g -O -DDEBUG - else --CFLAGS += -O2 --C2FLAGS += -O2 -+CFLAGS += -g -ggdb -+C2FLAGS += -g -ggdb - endif - - objects = upnpapi.o config.o ../lib/ssdp.o ../lib/soap.o \ diff --git a/devel/upnp104/files/patch-src::api::upnpapi.c b/devel/upnp104/files/patch-src::api::upnpapi.c deleted file mode 100644 index d08caa93fc7a..000000000000 --- a/devel/upnp104/files/patch-src::api::upnpapi.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/api/upnpapi.c.orig Fri Jun 15 08:22:15 2001 -+++ src/api/upnpapi.c Sat Aug 3 16:29:38 2002 -@@ -44,7 +44,7 @@ - #include - - #include --#include -+#include - #include - #include - #include diff --git a/devel/upnp104/files/patch-src::gena::Makefile b/devel/upnp104/files/patch-src::gena::Makefile deleted file mode 100644 index 9674cd45f921..000000000000 --- a/devel/upnp104/files/patch-src::gena::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gena/Makefile.orig Fri Jun 15 08:21:33 2001 -+++ src/gena/Makefile Sat Aug 3 16:29:39 2002 -@@ -61,7 +61,7 @@ - - TARGET = $(upnp_lib_dir)/gena.o - --CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -fpic -Wall -c -D_REENTRANT -+CFLAGS = -I$(upnp_inc_dir) -I$(upnp_src_inc_dir) -I$(LOCALBASE)/include -fpic -Wall -c -D_REENTRANT - - ifeq ($(DEBUG),1) - CFLAGS += -g -O -DDEBUG diff --git a/devel/upnp104/files/patch-src::genlib::tpool::interrupts.cpp b/devel/upnp104/files/patch-src::genlib::tpool::interrupts.cpp deleted file mode 100644 index fda9eca21463..000000000000 --- a/devel/upnp104/files/patch-src::genlib::tpool::interrupts.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/genlib/tpool/interrupts.cpp.orig Fri Jun 15 08:22:16 2001 -+++ src/genlib/tpool/interrupts.cpp Sat Aug 3 16:29:39 2002 -@@ -82,7 +82,7 @@ - int code; - - newset.sa_handler = signal_handler_alpha; -- newset.sa_flags = SA_NOMASK; -+ newset.sa_flags = SA_NODEFER; - code = sigaction( signalNum, &newset, &g_OldAction ); - if ( code < 0 ) - { diff --git a/devel/upnp104/files/patch-src::genlib::util::gmtdate.cpp b/devel/upnp104/files/patch-src::genlib::util::gmtdate.cpp deleted file mode 100644 index 419b9a202687..000000000000 --- a/devel/upnp104/files/patch-src::genlib::util::gmtdate.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/genlib/util/gmtdate.cpp.orig Fri Jun 15 08:22:16 2001 -+++ src/genlib/util/gmtdate.cpp Sat Aug 3 16:29:39 2002 -@@ -41,7 +41,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -@@ -254,7 +254,7 @@ - - val = (int)strtol( str, &endptr, 10 ); - -- if ( val < 0 || val == MAXINT ) -+ if ( val < 0 || val == INT_MAX ) - { - return -1; - } diff --git a/devel/upnp104/files/patch-src::ssdp::ssdplib.c b/devel/upnp104/files/patch-src::ssdp::ssdplib.c deleted file mode 100644 index a9152fe2e8bd..000000000000 --- a/devel/upnp104/files/patch-src::ssdp::ssdplib.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ssdp/ssdplib.c.orig Thu Aug 16 02:17:31 2001 -+++ src/ssdp/ssdplib.c Sat Aug 3 16:29:39 2002 -@@ -403,7 +403,7 @@ - bzero((char *)&SelfAddr, sizeof(struct sockaddr_in)); - - SelfAddr.sin_family = AF_INET; -- SelfAddr.sin_addr.s_addr = inet_addr(SSDP_IP); -+ SelfAddr.sin_addr.s_addr = htonl(INADDR_ANY); - SelfAddr.sin_port = htons(SSDP_PORT); - if (bind( SsdpSock, (struct sockaddr *) &SelfAddr, sizeof(SelfAddr)) != 0) - { diff --git a/devel/upnp104/pkg-descr b/devel/upnp104/pkg-descr deleted file mode 100644 index 37ce91f502fa..000000000000 --- a/devel/upnp104/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -The Universal Plug and Play (UPnP) Software Development Kit (SDK) v1.0 for -Linux is an SDK for development of UPnP device and control point applications -for Linux. It consists of the core UPnP protocols along with a UPnP-specific -eXtensible Markup Language (XML) parser supporting the Document Object Model -(DOM) Level 1 API and an optional, integrated mini web server for serving UPnP -related documents. - -Intel is not providing support for the UPnP SDK for Linux. Two mailing lists -for the UPnP SDK for Linux are available here: -WWW: http://upnp.sourceforge.net/ - -Questions and problems should be addressed on the appropriate mailing list. - -If you find this SDK useful, please send an email to upnp@intel.com and let -us know. - -* Other brands, names, and trademarks are the property of their respective -owners. diff --git a/devel/upnp104/pkg-plist b/devel/upnp104/pkg-plist deleted file mode 100644 index ed8da3ee2505..000000000000 --- a/devel/upnp104/pkg-plist +++ /dev/null @@ -1,19 +0,0 @@ -include/upnp/tools/config.h -include/upnp/tools/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 -@dirrm include/upnp -- cgit