[Midnightbsd-cvs] mports [24167] trunk/devel/upnp/pkg-plist: turn off samples

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 3 17:53:21 EDT 2018 

Revision: 24167
          http://svnweb.midnightbsd.org/mports/?rev=24167
Author:   laffer1
Date:     2018-09-03 17:53:20 -0400 (Mon, 03 Sep 2018)
Log Message:
-----------
turn off samples

Modified Paths:
--------------
    trunk/devel/upnp/Makefile
    trunk/devel/upnp/distinfo
    trunk/devel/upnp/files/patch-libupnp.pc.in
    trunk/devel/upnp/pkg-plist

Added Paths:
-----------
    trunk/devel/upnp/files/patch-threadutil__inc__ithread.h

Property Changed:
----------------
    trunk/devel/upnp/files/patch-libupnp.pc.in
    trunk/devel/upnp/files/patch-upnp-src-inc-uuid.h

Modified: trunk/devel/upnp/Makefile
===================================================================
--- trunk/devel/upnp/Makefile	2018-09-03 21:29:13 UTC (rev 24166)
+++ trunk/devel/upnp/Makefile	2018-09-03 21:53:20 UTC (rev 24167)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	upnp
-PORTVERSION=	1.6.19
-PORTREVISION=	2
+PORTVERSION=	1.6.22
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}
@@ -14,30 +13,21 @@
 LICENSE=	bsd3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS=	upnp-1.0.*
-
-USES=		libtool tar:bzip2
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--disable-samples
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd10.4
+INSTALL_TARGET=	install-strip
+USES=		cpe libtool pathfix tar:bzip2
+CPE_VENDOR=	libupnp_project
+CPE_PRODUCT=	libupnp
 USE_LDCONFIG=	yes
 
-MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LIBS="-llwres -lcompat"
-
-.include <bsd.mport.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--with-documentation=${DOCSDIR}
 PORTDOCS=	*
-.else
-CONFIGURE_ARGS+=	--without-documentation
-.endif
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
+OPTIONS_DEFINE=	DEBUG DOCS
 
-post-patch:	.SILENT
-	${REINPLACE_CMD} '/^pkgconfigexecdir/s|$$(libdir)|$$(prefix)/libdata|' \
-		${WRKSRC}/Makefile.in
+DEBUG_CONFIGURE_ON=	--enable-debug
+DOCS_CONFIGURE_ON=	--with-documentation=${DOCSDIR}
+DOCS_CONFIGURE_OFF=	--without-documentation
 
 .include <bsd.port.mk>

Modified: trunk/devel/upnp/distinfo
===================================================================
--- trunk/devel/upnp/distinfo	2018-09-03 21:29:13 UTC (rev 24166)
+++ trunk/devel/upnp/distinfo	2018-09-03 21:53:20 UTC (rev 24167)
@@ -1,2 +1,3 @@
-SHA256 (libupnp-1.6.19.tar.bz2) = b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a
-SIZE (libupnp-1.6.19.tar.bz2) = 1213439
+TIMESTAMP = 1536010208
+SHA256 (libupnp-1.6.22.tar.bz2) = 0bdfacb7fa8d99b78343b550800ff193264f92c66ef67852f87f042fd1a1ebbc
+SIZE (libupnp-1.6.22.tar.bz2) = 1242211

Modified: trunk/devel/upnp/files/patch-libupnp.pc.in
===================================================================
--- trunk/devel/upnp/files/patch-libupnp.pc.in	2018-09-03 21:29:13 UTC (rev 24166)
+++ trunk/devel/upnp/files/patch-libupnp.pc.in	2018-09-03 21:53:20 UTC (rev 24167)
@@ -1,10 +1,11 @@
---- libupnp.pc.in.orig	2010-10-09 13:09:32.000000000 +0200
-+++ libupnp.pc.in	2010-10-09 13:12:31.000000000 +0200
-@@ -6,6 +6,6 @@
+--- libupnp.pc.in.orig	2010-10-19 17:31:19 UTC
++++ libupnp.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
  Name: libupnp
  Description: Linux SDK for UPnP Devices
  Version: @VERSION@
 -Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
-+Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml @LIBS@
- Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
+-Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
++Libs: -pthread -L${libdir} -lupnp -lthreadutil -lixml @LIBS@
++Cflags: -I${includedir}/upnp
  


Property changes on: trunk/devel/upnp/files/patch-libupnp.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/devel/upnp/files/patch-threadutil__inc__ithread.h
===================================================================
--- trunk/devel/upnp/files/patch-threadutil__inc__ithread.h	                        (rev 0)
+++ trunk/devel/upnp/files/patch-threadutil__inc__ithread.h	2018-09-03 21:53:20 UTC (rev 24167)
@@ -0,0 +1,16 @@
+--- threadutil/inc/ithread.h.orig	2013-11-14 17:14:44 UTC
++++ threadutil/inc/ithread.h
+@@ -50,12 +50,9 @@ extern "C" {
+ 
+ #include <pthread.h>
+ 
+-#if defined(BSD) && !defined(__GNU__)
+-	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+-#endif
+ 
+ 
+-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
++#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__MidnightBSD__)
+ 	/* This system has SuS2-compliant mutex attributes.
+ 	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
+ 	 */


Property changes on: trunk/devel/upnp/files/patch-threadutil__inc__ithread.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/devel/upnp/files/patch-upnp-src-inc-uuid.h
===================================================================
--- trunk/devel/upnp/files/patch-upnp-src-inc-uuid.h	2018-09-03 21:29:13 UTC (rev 24166)
+++ trunk/devel/upnp/files/patch-upnp-src-inc-uuid.h	2018-09-03 21:53:20 UTC (rev 24167)

Property changes on: trunk/devel/upnp/files/patch-upnp-src-inc-uuid.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/upnp/pkg-plist
===================================================================
--- trunk/devel/upnp/pkg-plist	2018-09-03 21:29:13 UTC (rev 24166)
+++ trunk/devel/upnp/pkg-plist	2018-09-03 21:53:20 UTC (rev 24167)
@@ -1,19 +1,19 @@
-include/upnp/ixml.h
-include/upnp/ixmldebug.h
 include/upnp/FreeList.h
 include/upnp/LinkedList.h
 include/upnp/ThreadPool.h
 include/upnp/TimerThread.h
-include/upnp/ithread.h
-include/upnp/upnpconfig.h
 include/upnp/UpnpGlobal.h
 include/upnp/UpnpInet.h
 include/upnp/UpnpIntTypes.h
 include/upnp/UpnpStdInt.h
+include/upnp/UpnpString.h
 include/upnp/UpnpUniStd.h
+include/upnp/ithread.h
+include/upnp/ixml.h
+include/upnp/ixmldebug.h
 include/upnp/upnp.h
+include/upnp/upnpconfig.h
 include/upnp/upnpdebug.h
-include/upnp/UpnpString.h
 include/upnp/upnptools.h
 lib/libixml.a
 lib/libixml.so
@@ -26,5 +26,5 @@
 lib/libupnp.a
 lib/libupnp.so
 lib/libupnp.so.6
-lib/libupnp.so.6.3.3
+lib/libupnp.so.6.3.6
 libdata/pkgconfig/libupnp.pc

More information about the Midnightbsd-cvs mailing list