Hi Stuart,

On Sat, Apr 15, 2017 at 11:17:56PM +0100, Stuart Henderson wrote:
> > You can save some PFRAG juggling, see INCL_DIR in graphics/py-Pillow.

Brilliant. That's much better. New diff below. OK?

> P.S. If this is more widespread we could add something to the python module,
> it didn't seem worthwhile for just one port.

Seems sensible. I'll take a look into that at some point.



Index: Makefile
===================================================================
RCS file: /home/edd/cvsync/ports/devel/py-greenlet/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile    1 Sep 2016 10:53:26 -0000       1.11
+++ Makefile    19 Apr 2017 11:14:58 -0000
@@ -25,10 +25,15 @@ MODULES =   lang/python
 MODPY_SETUPTOOLS =     Yes
 MODPY_DISTUTILS_INSTALL=       install --prefix=${LOCALBASE} \
                                --root=${DESTDIR}
+FLAVORS =      python3
+FLAVOR ?=
+
+INCL_DIR =     ${MODPY_INCDIR:S/${LOCALBASE}\///}
+SUBST_VARS +=  INCL_DIR
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-greenlet
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}greenlet
        ${INSTALL_DATA} ${WRKSRC}/README.rst \
-               ${PREFIX}/share/doc/py-greenlet
+               ${PREFIX}/share/doc/${MODPY_PY_PREFIX}greenlet
 
 .include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /home/edd/cvsync/ports/devel/py-greenlet/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   17 Jul 2012 19:24:47 -0000      1.1.1.1
+++ pkg/PLIST   19 Apr 2017 11:14:44 -0000
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2012/07/17 19:24:47 landry Exp $
-include/python${MODPY_VERSION}/greenlet/
-include/python${MODPY_VERSION}/greenlet/greenlet.h
+${INCL_DIR}/greenlet/
+${INCL_DIR}/greenlet/greenlet.h
 
lib/python${MODPY_VERSION}/site-packages/greenlet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/greenlet.so
 share/doc/${MODPY_PY_PREFIX}greenlet/

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply via email to