Date: Thu, 7 Feb 2008 15:38:54 GMT From: Felippe de Meirelles Motta <lippemail@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/120350: [UPDATE] devel/upnp Message-ID: <200802071538.m17FcsCj023187@www.freebsd.org> Resent-Message-ID: <200802071550.m17Fo1pA079116@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120350
>Category: ports
>Synopsis: [UPDATE] devel/upnp
>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: Thu Feb 07 15:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Felippe de Meirelles Motta
>Release: FreeBSD 7.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD 7.0-PRERELEASE #0: Thu Jan 10 01:55:37 BRST 2008
lippe@shire.freebsd.org:/usr/obj/usr/src/sys/GENERIC
>Description:
- Updated to 1.6.5;
- Unbreak on 64-Bit;
- Use SF macro;
- Added OPTIONS;
- Remove post-patch, now unnecessary;
- New patch to install libupnp.pc in libdata/pkgconfig, and not lib/pkgconfig.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/upnp/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 25 Oct 2007 03:25:52 -0000 1.23
+++ Makefile 7 Feb 2008 15:34:25 -0000
@@ -6,11 +6,10 @@
#
PORTNAME= upnp
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.5
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pupnp
+MASTER_SITES= SF/pupnp
DISTNAME= lib${PORTNAME}-${PORTVERSION}
MAINTAINER= farrokhi@FreeBSD.org
@@ -23,12 +22,35 @@
USE_DOS2UNIX= yes
USE_LDCONFIG= yes
+OPTIONS= DEBUG "Enable debugging code" off \
+ CLIENT "Enable control point code" on \
+ DEVICE "Enable device specific code" on \
+ WEBSERVER "Enable integrated web server" on \
+ TOOLS "Enable helper APIs in upnptools.h" on \
+ SAMPLES "Enable compilation of upnp/sample code" on
+
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN= Does not compile with GCC 4.2
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-debug
+.endif
+.if !defined(WITH_CLIENT)
+CONFIGURE_ARGS+= --disable-client
+.endif
+.if !defined(WITH_DEVICE)
+CONFIGURE_ARGS+= --disable-device
+.endif
+.if !defined(WITH_WEBSERVER)
+CONFIGURE_ARGS+= --disable-webserver
.endif
+.if !defined(WITH_TOOLS)
+CONFIGURE_ARGS+= --disable-tools
+.endif
+.if !defined(WITH_SAMPLES)
+CONFIGURE_ARGS+= --disable-samples
+.endif
+.if !defined(WITH_CLIENT) && defined(WITH_WEBSERVER)
+BROKEN= When you disable client, it implies disable webserver too
.endif
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
@@ -40,10 +62,4 @@
CONFIGURE_ARGS= --with-documentation=${DOCSDIR}
.endif
-post-patch:
- ${FIND} ${WRKSRC} -type f | \
- ${XARGS} ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,'
- ${REINPLACE_CMD} -Ee 's,^(pkgconfigexecdir = ).*,\1${PREFIX}/libdata/pkgconfig,' \
- ${WRKSRC}/Makefile.in
-
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/upnp/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 9 Jul 2007 13:04:35 -0000 1.12
+++ distinfo 7 Feb 2008 15:34:25 -0000
@@ -1,3 +1,3 @@
-MD5 (libupnp-1.6.0.tar.bz2) = 3185b3fd9d7e8f5a3d29314e8d369c66
-SHA256 (libupnp-1.6.0.tar.bz2) = 447ef98ebdb42847b88acc7b222d36e1caeb6ead87f8f1821ed7a8dffb3c5114
-SIZE (libupnp-1.6.0.tar.bz2) = 1135997
+MD5 (libupnp-1.6.5.tar.bz2) = 2b0370e7c405a5bc80880085e6d7d827
+SHA256 (libupnp-1.6.5.tar.bz2) = 95b11e2db04c2e714c2f4fb05d9d31351d3388dababd4e1dd5300f4b0d5e8767
+SIZE (libupnp-1.6.5.tar.bz2) = 1136968
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/upnp/pkg-plist,v
retrieving revision 1.10
diff -u -r1.10 pkg-plist
--- pkg-plist 9 Jul 2007 13:04:35 -0000 1.10
+++ pkg-plist 7 Feb 2008 15:34:25 -0000
@@ -1,12 +1,11 @@
+include/upnp/ixml.h
include/upnp/FreeList.h
include/upnp/LinkedList.h
include/upnp/ThreadPool.h
include/upnp/TimerThread.h
-include/upnp/iasnprintf.h
include/upnp/ithread.h
-include/upnp/ixml.h
-include/upnp/upnp.h
include/upnp/upnpconfig.h
+include/upnp/upnp.h
include/upnp/upnpdebug.h
include/upnp/upnptools.h
lib/libixml.a
@@ -16,7 +15,7 @@
lib/libthreadutil.a
lib/libthreadutil.la
lib/libthreadutil.so
-lib/libthreadutil.so.3
+lib/libthreadutil.so.4
lib/libupnp.a
lib/libupnp.la
lib/libupnp.so
@@ -197,9 +196,9 @@
%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_E_SOCKET_READ-202.html
%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_E_SOCKET_WRITE-201.html
%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html
+%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html
%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_E_SUCCESS0.html
%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_E_TIMEDOUT-207.html
-%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCAPTED-302.html
%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_S_ALL.html
%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_S_DEVICE.html
%%PORTDOCS%%%%DOCSDIR%%/html/upnp/UPNP_S_ROOT.html
Index: files/patch-Makefile
===================================================================
RCS file: files/patch-Makefile
diff -N files/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile 7 Feb 2008 15:34:25 -0000
@@ -0,0 +1,11 @@
+--- Makefile.in.old 2008-02-07 12:24:52.000000000 -0200
++++ Makefile.in 2008-02-07 12:26:05.000000000 -0200
+@@ -241,7 +241,7 @@
+
+ # This variable must have 'exec' in its name, in order to be installed
+ # by 'install-exec' target (instead of default 'install-data')
+-pkgconfigexecdir = $(libdir)/pkgconfig
++pkgconfigexecdir = $(prefix)/libdata/pkgconfig
+ pkgconfigexec_DATA = libupnp.pc
+ CLEANFILES = IUpnpErrFile.txt IUpnpInfoFile.txt
+ all: autoconfig.h
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802071538.m17FcsCj023187>