svn commit: r458090 - head/textproc/meld

[Antoine Brodin]

On Thu, Jan 4, 2018 at 11:18 PM, Antoine Brodin <antoine at freebsd.org> wrote:
> On Thu, Jan 4, 2018 at 11:09 PM, Paweł Pękala <pawel at freebsd.org> wrote:
>> Hi Yuri,
>>
>> On 2018-01-04 13:57 -0800, Yuri <yuri at rawbw.com> wrote:
>>>On 01/04/18 13:41, Pawel Pekala wrote:
>>>>    Update to version 3.18.0, now requires Python 3
>>>
>>>It prints this warning during build:
>>>
>>>/!\ meld-3.18.0: Makefile warnings, please consider fixing /!\
>>>
>>>PYDISTUTILS_INSTALLNOSINGLE is deprecated, please do not use it anymore
>>>
>>
>> I'm aware of it, but I have no clue how to fix it at this point.
>> If anyone can help I'm all ears. Simple deletion just breaks install.
>
> According to an old irc log from mva, the fix was:
>
> 10:48 < _mva_> using plain distutils
> 10:49 < _mva_> not setuptools
> 10:50 < _mva_> PYDISTUTILS_SETUP= ${PYSETUP} and the likes
> 10:51 < _mva_> or overriding/changing PYDISTUTILS_INSTALLARGS
> 10:51 < _mva_> I have to figure out the details


So maybe something like:

Index: textproc/meld/Makefile
===================================================================
--- textproc/meld/Makefile (revision 458090)
+++ textproc/meld/Makefile (working copy)
@@ -21,9 +21,12 @@
 USE_PYTHON= distutils
 USE_GNOME= gtksourceview3 intltool libxml2:build pygobject3
 GLIB_SCHEMAS= org.gnome.meld.gschema.xml
-PYDISTUTILS_INSTALLNOSINGLE= yes
 PYDISTUTILS_INSTALL_TARGET= --no-update-icon-cache --no-compile-schemas install
 INSTALLS_ICONS= yes
 NO_ARCH= yes

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} --root=${STAGEDIR}
+
+.include <bsd.port.post.mk>

By the way,  this port should have a PYTHON_PKGNAMEPREFIX since it can
be flavored (py34, py35 and py36).

Cheers,

Antoine