Attachment 147829 Details for Bug 194031 – update, v2

[patch] update, v2

miniupnpc_update.diff (text/plain), 3.11 KB, created by Jan Beich on 2014-09-30 09:29:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-09-30 09:29:53 UTC

Size: 3.11 KB

patch

obsolete

>Index: net/miniupnpc/Makefile
>===================================================================
>--- net/miniupnpc/Makefile	(revision 368892)
>+++ net/miniupnpc/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	miniupnpc
>-PORTVERSION=	1.8
>+PORTVERSION=	1.9.20140911
> 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>
>Index: net/miniupnpc/distinfo
>===================================================================
>--- net/miniupnpc/distinfo	(revision 368892)
>+++ net/miniupnpc/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (miniupnpc-1.8.tar.gz) = bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c
>-SIZE (miniupnpc-1.8.tar.gz) = 70624
>+SHA256 (miniupnpc-1.9.20140911.tar.gz) = 7435bebfdd8c76127136f733979ad2ab56999d204176a1044293536f2e20b21c
>+SIZE (miniupnpc-1.9.20140911.tar.gz) = 76855
>Index: net/miniupnpc/files/patch-Makefile
>===================================================================
>--- net/miniupnpc/files/patch-Makefile	(revision 368892)
>+++ net/miniupnpc/files/patch-Makefile	(working copy)
>@@ -9,15 +9,6 @@
>  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 @@
>  TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o
>  endif
>Index: net/miniupnpc/pkg-plist
>===================================================================
>--- net/miniupnpc/pkg-plist	(revision 368892)
>+++ net/miniupnpc/pkg-plist	(working copy)
>@@ -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
>-@dirrm include/miniupnpc
>Index: net/py-miniupnpc/Makefile
>===================================================================
>--- net/py-miniupnpc/Makefile	(revision 368892)
>+++ net/py-miniupnpc/Makefile	(working copy)
>@@ -9,8 +9,9 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/mini
> 
> MASTERDIR=	${.CURDIR}/../miniupnpc
> 
>-USE_PYTHON=	yes
>-USE_PYDISTUTILS=yes
>+USES=		python
>+USE_PYTHON=	distutils
>+PYDISTUTILS_PKGVERSION=${PORTVERSION:C/\.[0-9]{8}//}
> 
> WRKDIR=		${WRKDIRPREFIX}${MASTERDIR}/work
> PLIST=		${.CURDIR}/pkg-plist
>@@ -19,8 +20,7 @@ PLIST=		${.CURDIR}/pkg-plist
> .include "${.CURDIR}/Makefile.local"
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} 's/$version$="[^"]*"/\1="${PORTVERSION}"/' \
>-		${WRKSRC}/setup.py
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so
> 
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 194031: 147825 | 147826 | 147827 | 147828 | 147829 | 147830