On Sat, Mar 14, 2020 at 03:29:41PM +0000, Stuart Henderson wrote:
> On 2020/03/14 16:07, Klemens Nanni wrote:
> > Only the -zenmap package uses Python, -main is standalone.
> >
> > This is another quirk I need to purge Python 2 while keeping useful
> > packages.
> >
> > Feedback? OK?
>
> > MODLUA_SA= Yes
> > MODLUA_VERSION= 5.3
> > +MODPY_RUNDEP= No
>
> Generally I would prefer to avoid MODPY_RUNDEP=No for a port which does
> actually have a run dep on python (just in a subpackage) and do things by
> setting RUN_DEPENDS-main instead for the lua dep...but lua.port.mk is a
> bit special with how it handles run dep's so let's not go there :)
Yup, this diff seems the most simple on and does is not too bad.
> So: could you add a "# added manually for -zenmap" or something next to
> the RUNDEP=No line please?
Sure, then it's more obvious.
Cc'ing MAINTAINER now, forgot it previously.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.137
diff -u -p -r1.137 Makefile
--- Makefile 24 Aug 2019 06:37:13 -0000 1.137
+++ Makefile 14 Mar 2020 15:39:51 -0000
@@ -7,6 +7,7 @@ MODPY_EGG_VERSION= 7.80
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
+REVISION-main= 0
CATEGORIES= net security
MASTER_SITES= ${HOMEPAGE}/dist/
@@ -26,6 +27,8 @@ COMPILER = base-clang ports-gcc base-gc
USE_GMAKE= Yes
MODLUA_SA= Yes
MODLUA_VERSION= 5.3
+# added manually for -zenmap
+MODPY_RUNDEP= No
MODULES= lang/python \
lang/lua
@@ -53,7 +56,8 @@ LIB_DEPENDS-main=devel/pcre \
${MODLUA_LIB_DEPENDS} \
security/libssh2
-RUN_DEPENDS-zenmap= x11/py-gtk2 \
+RUN_DEPENDS-zenmap= ${MODPY_RUN_DEPENDS} \
+ x11/py-gtk2 \
databases/py-sqlite2 \
devel/desktop-file-utils \
net/nmap
