On 2011-06-13, Nigel Taylor <[email protected]> wrote:
> On 06/13/11 13:41, Stuart Henderson wrote:
>> On 2011-06-13, Nigel Taylor <[email protected]> wrote:
>>> vte,-pty-helper, make print-package-signature doesn't match pkg_info -S
>>> so dpb -R rebuilds unnecessarily. lib-depends-check fails for vte,-python
>>>
>>> Please check and update.
>>
>> shouldn't this be in the .if ${FLAVOR... block, probably with a
>> similar WANTLIB-python for the gtk3 flavour?
>>
>> also needs REVISION bumps for -python and -pty-helper.
>>
>>
>>
> Hi,
>
> I haven't been bumping versions, on the patches, I can do that in the
> future.
>
> gtk3 flavor WANTLIB-python would require a MULTI_PACKAGES to include
> python for gtk3, -python added in the .else block to MULTI_PACKAGES, so
> there is no python for the gtk3 flavor.
>
> Regards
>
> Nigel Taylor
>
>
If we're touching this I think it makes sense to move the py-gtk2
dep down within the gtk2 block.
Untested as I don't have py2.7 packages installed yet.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/vte/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- Makefile 13 Jun 2011 07:19:59 -0000 1.79
+++ Makefile 13 Jun 2011 21:05:47 -0000
@@ -12,8 +12,8 @@ PKGNAME-python= py-${DISTNAME}
PKGNAME-pty-helper= vte-ptyhelper-${GNOME_VERSION}
REVISION-main= 3
-REVISION-python= 1
-REVISION-pty-helper= 0
+REVISION-python= 2
+REVISION-pty-helper= 1
REVISION-gtk3= 0
CATEGORIES= devel
@@ -49,15 +49,16 @@ WANTLIB-main= ${WANTLIB} c pthread
WANTLIB-pty-helper= util c
-WANTLIB-python= ${WANTLIB} ffi vte>=14 gtk-x11-2.0
+WANTLIB-python= ${WANTLIB} ffi vte>=14
BUILD_DEPENDS= devel/gobject-introspection
LIB_DEPENDS-python= ${LIB_DEPENDS-main} \
${BASE_PKGPATH} \
devel/libffi
-RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS} \
- x11/py-gtk2
+RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
+
+LIB_DEPENDS-pty-helper= # empty
PSEUDO_FLAVORS= gtk3
FLAVOR?=
@@ -75,6 +76,8 @@ RUN_DEPENDS-main+= ${BASE_PKGPATH},-pty-
LIB_DEPENDS-main= ${LIB_DEPENDS} \
x11/gtk+2
WANTLIB-main+= gdk-x11-2.0 gtk-x11-2.0
+RUN_DEPENDS-python= x11/py-gtk2
+WANTLIB-python+= gdk-x11-2.0 gtk-x11-2.0
CONFIGURE_ARGS+= --with-gtk=2.0
MULTI_PACKAGES+= -python
PKGNAME-main= vte-${GNOME_VERSION}
