diff options
| author | tijl <tijl@FreeBSD.org> | 2014-07-11 18:26:02 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-07-11 18:26:02 +0800 |
| commit | bd60e6c026a5549f52907d7430e80ccb3e1630c4 (patch) | |
| tree | ba050b62e0147b5e6c12560e0abd5bfea89c442d /devel | |
| parent | 550a7d3f410c006cb655938cd7372557e5719d25 (diff) | |
| download | freebsd-ports-gnome-bd60e6c026a5549f52907d7430e80ccb3e1630c4.tar.gz freebsd-ports-gnome-bd60e6c026a5549f52907d7430e80ccb3e1630c4.tar.zst freebsd-ports-gnome-bd60e6c026a5549f52907d7430e80ccb3e1630c4.zip | |
- Add USES=libtool to devel/upnp and bump dependent ports
- Add USES=pathfix and INSTALL_TARGET=install-strip
- Add a patch to fix definitions of ITHREAD_MUTEX_*
Approved by: portmgr (implicit, bump unstaged port)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/upnp/Makefile | 8 | ||||
| -rw-r--r-- | devel/upnp/files/patch-threadutil__inc__ithread.h | 16 | ||||
| -rw-r--r-- | devel/upnp/pkg-plist | 8 |
3 files changed, 23 insertions, 9 deletions
diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile index 465649c7d89a..9e4f77ce48ab 100644 --- a/devel/upnp/Makefile +++ b/devel/upnp/Makefile @@ -3,6 +3,7 @@ PORTNAME= upnp PORTVERSION= 1.6.19 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION} @@ -14,8 +15,9 @@ COMMENT= Universal Plug and Play Software Development Kit LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= tar:bzip2 GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= libtool pathfix tar:bzip2 USE_LDCONFIG= yes PORTDOCS= * @@ -26,8 +28,4 @@ DEBUG_CONFIGURE_ON= --enable-debug DOCS_CONFIGURE_ON= --with-documentation=${DOCSDIR} DOCS_CONFIGURE_OFF= --without-documentation -post-patch: .SILENT - ${REINPLACE_CMD} '/^pkgconfigexecdir/s|$$(libdir)|$$(prefix)/libdata|' \ - ${WRKSRC}/Makefile.in - .include <bsd.port.mk> diff --git a/devel/upnp/files/patch-threadutil__inc__ithread.h b/devel/upnp/files/patch-threadutil__inc__ithread.h new file mode 100644 index 000000000000..445f35c941e9 --- /dev/null +++ b/devel/upnp/files/patch-threadutil__inc__ithread.h @@ -0,0 +1,16 @@ +--- threadutil/inc/ithread.h.orig ++++ threadutil/inc/ithread.h +@@ -50,12 +50,9 @@ + + #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__) + /* This system has SuS2-compliant mutex attributes. + * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols + */ diff --git a/devel/upnp/pkg-plist b/devel/upnp/pkg-plist index fd47214b2268..69cf97821eae 100644 --- a/devel/upnp/pkg-plist +++ b/devel/upnp/pkg-plist @@ -16,16 +16,16 @@ include/upnp/upnpdebug.h include/upnp/UpnpString.h include/upnp/upnptools.h lib/libixml.a -lib/libixml.la lib/libixml.so lib/libixml.so.2 +lib/libixml.so.2.0.8 lib/libthreadutil.a -lib/libthreadutil.la lib/libthreadutil.so lib/libthreadutil.so.6 +lib/libthreadutil.so.6.0.4 lib/libupnp.a -lib/libupnp.la lib/libupnp.so -lib/libupnp.so.9 +lib/libupnp.so.6 +lib/libupnp.so.6.3.3 libdata/pkgconfig/libupnp.pc @dirrm include/upnp |