- preset the default dynamips hypervisor path to the location where

it's installed by our dynamips port. bump package.

- remove NO_BUILD, it does actually carry out some steps in the build
stage. if they're left until fake-install, root-owned files in the work
directory prevent "make clean" from working.

ok Jonathan Armani (maintainer).
This commit is contained in:
sthen 2009-04-05 13:31:38 +00:00
parent bd7a0b975a
commit ea66f2c537
2 changed files with 17 additions and 3 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2009/03/15 13:31:58 espie Exp $
# $OpenBSD: Makefile,v 1.6 2009/04/05 13:31:38 sthen Exp $
COMMENT= graphical network simulator
MODPY_EGG_VERSION= 0.5
V= 0.6
DISTNAME= GNS3-$V-src
PKGNAME= gns3-$Vp0
PKGNAME= gns3-$Vp1
CATEGORIES= emulators
@ -26,8 +26,10 @@ BUILD_DEPENDS= ${_MODPY_BUILD_DEPENDS}
RUN_DEPENDS= ::x11/py-qt4 \
::emulators/dynamips
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/GNS3/Application.py
.include <bsd.port.mk>

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_GNS3_Application_py,v 1.1 2009/04/05 13:31:38 sthen Exp $
--- src/GNS3/Application.py.orig Sun Apr 5 11:28:42 2009
+++ src/GNS3/Application.py Sun Apr 5 11:28:46 2009
@@ -259,7 +259,7 @@ class Application(QApplication, Singleton):
self.systconf['dynamips'] = systemDynamipsConf()
confo = self.systconf['dynamips']
- confo.path = ConfDB().get('Dynamips/hypervisor_path', unicode(''))
+ confo.path = ConfDB().get('Dynamips/hypervisor_path', unicode('${PREFIX}/bin/dynamips'))
confo.port = int(ConfDB().get('Dynamips/hypervisor_port', 7200))
confo.baseUDP = int(ConfDB().get('Dynamips/hypervisor_baseUDP', 10000))
confo.baseConsole = int(ConfDB().get('Dynamips/hypervisor_baseConsole', 2000))