cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move examples to /usr/local/share/examples.

Browse Source 
Fix for bug introduced in last revision

OK phessler@
This commit is contained in:
akoshibe 2017-09-16 06:03:05 +00:00
parent 9070cc479c
commit 099661ec5e
4 changed files with 62 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/mininet/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2017/09/09 21:18:30 akoshibe Exp $
# $OpenBSD: Makefile,v 1.5 2017/09/16 06:03:05 akoshibe Exp $
COMMENT = emulator for rapid prototyping of software defined networks
DISTNAME = mininet-0.0.20170813
REVISION = 1
REVISION = 2
GH_ACCOUNT = mininet
GH_PROJECT = mininet
GH_COMMIT = 87e26ef931ee6063332ceba77db472140f832d3a
@ -43,4 +43,10 @@ pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mininet
${INSTALL_DATA} ${WRKBUILD}/README.md ${PREFIX}/share/doc/mininet
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mininet
.for f in examples/README.md examples/*.py
${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/examples/mininet
.endfor
.include <bsd.port.mk>

11
net/mininet/patches/patch-mininet_node_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mininet_node_py,v 1.2 2017/09/09 21:18:30 akoshibe Exp $
$OpenBSD: patch-mininet_node_py,v 1.3 2017/09/16 06:03:05 akoshibe Exp $
Original Node functions are now in BaseNode, subclassed by OS-
specific Node objects.
Index: mininet/node.py
@ -904,7 +904,7 @@ Index: mininet/node.py
pstr = ':%d ' % self.port
clist = servers[ 0:1 ] + [ s for s in servers if pstr in s ]
raise Exception( "Please shut down the controller which is"
@@ -1405,9 +1026,12 @@ class Controller( Node ):
@@ -1405,9 +1026,13 @@ class Controller( Node ):
self.execed = False
def stop( self, *args, **kwargs ):
@ -915,12 +915,13 @@ Index: mininet/node.py
+ Stop controller. Find processes associated with the command, and kill
+ them.
+ """
+ self.cmd( 'kill ' + pids + ' 2>/dev/null' )
+ pids = " ".join( self.cmd( 'pgrep ' + self.command ).split( '\n' ) )
+ self.cmd( 'pkill ' + pids + ' 2>/dev/null' )
+ self.cmd( 'wait ' + pids )
super( Controller, self ).stop( *args, **kwargs )
def IP( self, intf=None ):
@@ -1470,12 +1094,19 @@ class NOX( Controller ):
@@ -1470,12 +1095,19 @@ class NOX( Controller ):
class Ryu( Controller ):
"Controller to run Ryu application"
@ -942,7 +943,7 @@ Index: mininet/node.py
if not ryuArgs:
warn( 'warning: no Ryu modules specified; '
'running simple_switch only\n' )
@@ -1538,7 +1169,50 @@ class RemoteController( Controller ):
@@ -1538,7 +1170,50 @@ class RemoteController( Controller ):
else:
return True

12
net/mininet/patches/patch-setup_py
View File

@ -1,17 +1,21 @@
$OpenBSD: patch-setup_py,v 1.2 2017/09/02 23:10:52 akoshibe Exp $
$OpenBSD: patch-setup_py,v 1.3 2017/09/16 06:03:05 akoshibe Exp $
examples/ is apparently used for beta feature modules, so pull in just
the absolutely needed ones.
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -20,7 +20,11 @@ setup(
@@ -20,7 +20,14 @@ setup(
description='Process-based OpenFlow emulator',
author='Bob Lantz',
author_email='rlantz@cs.stanford.edu',
- packages=[ 'mininet', 'mininet.examples' ],
+ packages=[
+ 'mininet',
+ 'mininet.examples',
+ 'mininet.openbsd'
+ ],
+ py_modules=[
+ 'mininet.examples.cluster',
+ 'mininet.examples.clustercli'
+ ],
long_description="""
Mininet is a network emulator which uses lightweight

109
net/mininet/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2017/09/02 23:10:52 akoshibe Exp $
@comment $OpenBSD: PLIST,v 1.3 2017/09/16 06:03:05 akoshibe Exp $
bin/mn
@bin bin/mnexec
lib/python${MODPY_VERSION}/site-packages/mininet/
@ -21,78 +21,10 @@ lib/python${MODPY_VERSION}/site-packages/mininet/cli.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/
lib/python${MODPY_VERSION}/site-packages/mininet/examples/__init__.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/baresshd.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/baresshd.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/bind.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/bind.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/cluster.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/cluster.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/clusterSanity.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/clusterSanity.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/clustercli.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/clustercli.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/clusterdemo.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/clusterdemo.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/clusterperf.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/clusterperf.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/consoles.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/consoles.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/controllers.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/controllers.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/controllers2.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/controllers2.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/controlnet.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/controlnet.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/cpu.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/cpu.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/emptynet.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/emptynet.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/hwintf.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/hwintf.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/intfoptions.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/intfoptions.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/limit.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/limit.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/linearbandwidth.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/linearbandwidth.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/linuxrouter.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/linuxrouter.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/miniedit.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/miniedit.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/mobility.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/mobility.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/multilink.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/multilink.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/multiping.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/multiping.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/multipoll.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/multipoll.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/multitest.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/multitest.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/nat.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/nat.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/natnet.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/natnet.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/numberedports.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/numberedports.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/popen.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/popen.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/popenpoll.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/popenpoll.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/scratchnet.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/scratchnet.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/scratchnetuser.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/scratchnetuser.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/simpleperf.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/simpleperf.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/sshd.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/sshd.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/tree1024.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/tree1024.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/treeping64.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/treeping64.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/examples/vlanhost.py
lib/python${MODPY_VERSION}/site-packages/mininet/examples/vlanhost.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/link.py
lib/python${MODPY_VERSION}/site-packages/mininet/link.pyc
lib/python${MODPY_VERSION}/site-packages/mininet/log.py
@ -126,3 +58,42 @@ lib/python${MODPY_VERSION}/site-packages/mininet/util.pyc
@man man/man1/mnexec.1
share/doc/mininet/
share/doc/mininet/README.md
share/examples/mininet/
share/examples/mininet/README.md
share/examples/mininet/__init__.py
share/examples/mininet/baresshd.py
share/examples/mininet/bind.py
share/examples/mininet/cluster.py
share/examples/mininet/clusterSanity.py
share/examples/mininet/clustercli.py
share/examples/mininet/clusterdemo.py
share/examples/mininet/clusterperf.py
share/examples/mininet/consoles.py
share/examples/mininet/controllers.py
share/examples/mininet/controllers2.py
share/examples/mininet/controlnet.py
share/examples/mininet/cpu.py
share/examples/mininet/emptynet.py
share/examples/mininet/hwintf.py
share/examples/mininet/intfoptions.py
share/examples/mininet/limit.py
share/examples/mininet/linearbandwidth.py
share/examples/mininet/linuxrouter.py
share/examples/mininet/miniedit.py
share/examples/mininet/mobility.py
share/examples/mininet/multilink.py
share/examples/mininet/multiping.py
share/examples/mininet/multipoll.py
share/examples/mininet/multitest.py
share/examples/mininet/nat.py
share/examples/mininet/natnet.py
share/examples/mininet/numberedports.py
share/examples/mininet/popen.py
share/examples/mininet/popenpoll.py
share/examples/mininet/scratchnet.py
share/examples/mininet/scratchnetuser.py
share/examples/mininet/simpleperf.py
share/examples/mininet/sshd.py
share/examples/mininet/tree1024.py
share/examples/mininet/treeping64.py
share/examples/mininet/vlanhost.py