Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jan 2018 11:59:44 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r458243 - in branches/2018Q1/net: miniupnpc/files py-miniupnpc
Message-ID:  <201801061159.w06Bxie8012930@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sat Jan  6 11:59:44 2018
New Revision: 458243
URL: https://svnweb.freebsd.org/changeset/ports/458243

Log:
  MFH: r458235 r458238
  
  Fix after empty FLAVOR as make argument was forbidden
  
  Remove the use of submake, and use the parent's port shared library
  instead.
  
  While there, remove an obsolete sed line that does not match anything.

Added:
  branches/2018Q1/net/miniupnpc/files/patch-setup.py
     - copied unchanged from r458238, head/net/miniupnpc/files/patch-setup.py
Modified:
  branches/2018Q1/net/py-miniupnpc/Makefile
Directory Properties:
  branches/2018Q1/   (props changed)

Copied: branches/2018Q1/net/miniupnpc/files/patch-setup.py (from r458238, head/net/miniupnpc/files/patch-setup.py)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/net/miniupnpc/files/patch-setup.py	Sat Jan  6 11:59:44 2018	(r458243, copy of r458238, head/net/miniupnpc/files/patch-setup.py)
@@ -0,0 +1,10 @@
+--- setup.py.orig	2018-01-06 09:33:40 UTC
++++ setup.py
+@@ -23,6 +23,6 @@ setup(name="miniupnpc",
+       description='miniUPnP client',
+       ext_modules=[
+          Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
+-                   extra_objects=["libminiupnpc.a"])
++                   libraries=["miniupnpc"])
+       ])
+ 

Modified: branches/2018Q1/net/py-miniupnpc/Makefile
==============================================================================
--- branches/2018Q1/net/py-miniupnpc/Makefile	Sat Jan  6 10:49:36 2018	(r458242)
+++ branches/2018Q1/net/py-miniupnpc/Makefile	Sat Jan  6 11:59:44 2018	(r458243)
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
 CATEGORIES=	net python
+PORTREVISION=	1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python module for miniupnpc
 
-BUILD_DEPENDS=	${NONEXISTENT}:net/miniupnpc:build
+LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 
 MASTERDIR=	${.CURDIR}/../miniupnpc
 
@@ -13,13 +14,6 @@ USES=		python
 USE_PYTHON=	autoplist distutils
 
 PLIST=		${.CURDIR}/pkg-plist
-
-post-patch:
-	${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \
-		${WRKSRC}/setup.py
-
-pre-build:
-	${CP} $$(make FLAVOR= -C ${MASTERDIR} -V WRKSRC)/libminiupnpc.a ${WRKSRC}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801061159.w06Bxie8012930>