On 2014/11/17 21:37, Bertrand Janin wrote: > Stuart Henderson wrote : > > On 2014/11/17 21:06, Bertrand Janin wrote: > > > Hi, > > > > > > attached is the latest version of flake8, a modular python code checker > > > wrapping tools such as pyflakes, pep8 and McCabe for complexity checks. > > > > > > Bertrand > > > > From pkg/PLIST: > > > > lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info/ > > (and others on the following lines) > > > > the only time FULLPKGNAME should appear in a PLIST file is when it's used > > for a pkg-readmes doc file. In this case try this: > > > > lib/python${MODPY_VERSION}/site-packages/flake8-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ > > I see, here is the updated version.
Updated version is OK sthen@ if someone would like to import. > Does it sound possible to fix "make plist" to do the right thing for MODPY > packages? And if yes, any pointers to get me started? It would certainly make things easier for python ports, but would need in the region of 270 ports changing to cope. As far as the PLIST side of things goes, it could be done with something like the diff below. Then it would need a sweep of the tree to update all PLIST files currently using FULLPKGNAME; some, especially in www/ (but there are a few others) will need @cwd lines tweaking too. The README files themselves would need changing too, they use the string "Running ${FULLPKGNAME} on OpenBSD" which we'd need to replace, probably with a fixed text string like "Running MariaDB on OpenBSD". REVISION bumps all round too. We would also need some other scheme than we're currently using for the lua ports (which are using FULLPKGNAME in a non-broken way), simplest method there is to SUBST_VARS+=FULLPKGNAME in lua.port.mk, though it would be nicer to add a stripped version of MODLUA_DOCDIR (i.e. without the /usr/local prefix) to SUBST_VARS and use that in PLISTs instead (if only to avoid people seeing it as an example of FULLPKGNAME use in PLISTs ;) Index: bsd.port.mk =================================================================== RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v retrieving revision 1.1284 diff -u -p -r1.1284 bsd.port.mk --- bsd.port.mk 3 Nov 2014 16:35:05 -0000 1.1284 +++ bsd.port.mk 18 Nov 2014 10:19:15 -0000 @@ -522,6 +522,7 @@ _PKG_ARGS = _PKG_ARGS += -DHISTORY_DIR=${PLIST_DB}/history .endif _README_DIR = ${LOCALBASE}/share/doc/pkg-readmes +PKG_README = share/doc/pkg-readmes/${FULLPKGNAME} PSEUDO_FLAVOR = # (applies only to PLIST for now) @@ -992,7 +993,7 @@ _lt_libs += lib${_n:S/+/_/g:S/-/_/g:S/./ # Create the generic variable substitution list, from subst vars SUBST_VARS += MACHINE_ARCH ARCH HOMEPAGE ^PREFIX ^SYSCONFDIR FLAVOR_EXT \ - FULLPKGNAME MAINTAINER ^BASE_PKGPATH ^LOCALBASE ^X11BASE ^TRUEPREFIX \ + PKG_README MAINTAINER ^BASE_PKGPATH ^LOCALBASE ^X11BASE ^TRUEPREFIX \ ^RCDIR ^LOCALSTATEDIR _tmpvars =