svn commit: r370628 - in head: irc/iroffer-dinoex net/miniupnpc net/miniupnpc/files net/py-miniupnpc

[Dirk Meyer]

Author: dinoex
Date: Sat Oct 11 09:12:17 2014
New Revision: 370628
URL: https://svnweb.freebsd.org/changeset/ports/370628
QAT: https://qat.redports.org/buildarchive/r370628/

Log:
  - update miniupnpc to 1.9
  - bump users of shared lib version
  PR:		194031

Modified:
  head/irc/iroffer-dinoex/Makefile
  head/net/miniupnpc/Makefile
  head/net/miniupnpc/distinfo
  head/net/miniupnpc/files/patch-Makefile
  head/net/miniupnpc/pkg-plist
  head/net/py-miniupnpc/Makefile

Modified: head/irc/iroffer-dinoex/Makefile
==============================================================================
--- head/irc/iroffer-dinoex/Makefile	Sat Oct 11 07:32:37 2014	(r370627)
+++ head/irc/iroffer-dinoex/Makefile	Sat Oct 11 09:12:17 2014	(r370628)
@@ -2,7 +2,7 @@
 
 PORTNAME=	iroffer
 PORTVERSION=	3.29
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://iroffer.dinoex.net/
 PKGNAMESUFFIX=	-dinoex${PKGNAMESUFFIX2}

Modified: head/net/miniupnpc/Makefile
==============================================================================
--- head/net/miniupnpc/Makefile	Sat Oct 11 07:32:37 2014	(r370627)
+++ head/net/miniupnpc/Makefile	Sat Oct 11 09:12:17 2014	(r370628)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	miniupnpc
-PORTVERSION=	1.8
+PORTVERSION=	1.9
 CATEGORIES?=	net
 MASTER_SITES=	http://miniupnp.free.fr/files/
 
@@ -16,7 +16,7 @@ HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_SCRIPT=	updateminiupnpcstrings.sh
-MAKE_ENV+=	INSTALLPREFIX=${STAGEDIR}${PREFIX}
+MAKE_ENV+=	INSTALLPREFIX=${PREFIX}
 
 .include <bsd.port.pre.mk>
 
@@ -26,6 +26,10 @@ CFLAGS+=	-DDEBUG
 
 .if ${SLAVE_PORT} == no
 USE_RC_SUBR=	miniupnpc
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/upnpc \
+		${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.10
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/net/miniupnpc/distinfo
==============================================================================
--- head/net/miniupnpc/distinfo	Sat Oct 11 07:32:37 2014	(r370627)
+++ head/net/miniupnpc/distinfo	Sat Oct 11 09:12:17 2014	(r370628)
@@ -1,2 +1,2 @@
-SHA256 (miniupnpc-1.8.tar.gz) = bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c
-SIZE (miniupnpc-1.8.tar.gz) = 70624
+SHA256 (miniupnpc-1.9.tar.gz) = 2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464
+SIZE (miniupnpc-1.9.tar.gz) = 74230

Modified: head/net/miniupnpc/files/patch-Makefile
==============================================================================
--- head/net/miniupnpc/files/patch-Makefile	Sat Oct 11 07:32:37 2014	(r370627)
+++ head/net/miniupnpc/files/patch-Makefile	Sat Oct 11 09:12:17 2014	(r370628)
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-01-28 12:10:25.000000000 +0200
-+++ Makefile	2013-02-07 15:19:04.788319388 +0200
+--- Makefile.orig	2014-01-31 14:57:23.000000000 +0100
++++ Makefile	2014-10-07 23:26:17.000000000 +0200
 @@ -35,7 +35,7 @@
  CFLAGS += -fno-common
  CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT
@@ -9,16 +9,7 @@
  CFLAGS += -ansi
  # -DNO_GETADDRINFO
  INSTALL = install
-@@ -80,7 +80,7 @@
-   SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib
-   CFLAGS := -DMACOSX -D_DARWIN_C_SOURCE $(CFLAGS)
- else
--ifeq ($(OS), Linux)
-+ifeq ($(OS), FreeBSD)
-   SHAREDLIBRARY = libminiupnpc.so
-   SONAME = $(SHAREDLIBRARY).$(APIVERSION)
- endif
-@@ -110,13 +110,11 @@
+@@ -117,13 +117,11 @@
  TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o
  endif
  

Modified: head/net/miniupnpc/pkg-plist
==============================================================================
--- head/net/miniupnpc/pkg-plist	Sat Oct 11 07:32:37 2014	(r370627)
+++ head/net/miniupnpc/pkg-plist	Sat Oct 11 09:12:17 2014	(r370628)
@@ -11,6 +11,5 @@ include/miniupnpc/upnpreplyparse.h
 include/miniupnpc/upnperrors.h
 lib/libminiupnpc.a
 lib/libminiupnpc.so
-lib/libminiupnpc.so.9
+lib/libminiupnpc.so.10
 man/man3/miniupnpc.3.gz
- at dirrm include/miniupnpc

Modified: head/net/py-miniupnpc/Makefile
==============================================================================
--- head/net/py-miniupnpc/Makefile	Sat Oct 11 07:32:37 2014	(r370627)
+++ head/net/py-miniupnpc/Makefile	Sat Oct 11 09:12:17 2014	(r370628)
@@ -9,8 +9,8 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR
 
 MASTERDIR=	${.CURDIR}/../miniupnpc
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python
+USE_PYTHON=	distutils
 
 WRKDIR=		${WRKDIRPREFIX}${MASTERDIR}/work
 PLIST=		${.CURDIR}/pkg-plist
@@ -20,7 +20,10 @@ PLIST=		${.CURDIR}/pkg-plist
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \
+	${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \
 		${WRKSRC}/setup.py
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so
+
 .include "${MASTERDIR}/Makefile"