From 250e39079dede01d3e31c9cebbe790f8fd5acd7a Mon Sep 17 00:00:00 2001 From: landry Date: Tue, 3 Jan 2023 08:39:42 +0000 Subject: [PATCH] x11/xfce4: tweak previous and readd --enable-maintainer-mode when using XFCE_COMMIT taskmanager failed to build because git-provided tarballs don't contain c/h code generated from .ui files, which are only generated when --enable-maintainer-mode is used. Failure reported by ajacoutot@ --- x11/xfce4/orage/Makefile | 2 +- x11/xfce4/xfce4-mixer/Makefile | 2 +- x11/xfce4/xfce4-taskmanager/Makefile | 2 +- x11/xfce4/xfce4-wavelan/Makefile | 2 +- x11/xfce4/xfce4.port.mk | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/x11/xfce4/orage/Makefile b/x11/xfce4/orage/Makefile index a8e7f4adc78..499d41392ba 100644 --- a/x11/xfce4/orage/Makefile +++ b/x11/xfce4/orage/Makefile @@ -3,7 +3,7 @@ COMMENT= Xfce4 calendar XFCE_VERSION= 4.17.0pre0 XFCE_COMMIT= cf27a483c40188bb XFCE_GOODIE= orage -REVISION= 0 +REVISION= 1 # GPLv2 PERMIT_PACKAGE= Yes diff --git a/x11/xfce4/xfce4-mixer/Makefile b/x11/xfce4/xfce4-mixer/Makefile index eb01b7b9496..e644ec5ff2f 100644 --- a/x11/xfce4/xfce4-mixer/Makefile +++ b/x11/xfce4/xfce4-mixer/Makefile @@ -3,7 +3,7 @@ COMMENT= Xfce4 volume mixer XFCE_GOODIE= xfce4-mixer XFCE_VERSION= 4.18.0pre0 XFCE_COMMIT= a71951036481ca08a670ad8bf3cd107d37bfb774 -REVISION= 0 +REVISION= 1 # GPLv2 PERMIT_PACKAGE= Yes diff --git a/x11/xfce4/xfce4-taskmanager/Makefile b/x11/xfce4/xfce4-taskmanager/Makefile index e0ea7d288d0..ffa1651b131 100644 --- a/x11/xfce4/xfce4-taskmanager/Makefile +++ b/x11/xfce4/xfce4-taskmanager/Makefile @@ -3,7 +3,7 @@ COMMENT= Xfce4 task manager and system monitor XFCE_VERSION= 1.5.5 XFCE_COMMIT= c4564879 XFCE_GOODIE= xfce4-taskmanager -REVISION= 1 +REVISION= 2 # GPLv2 PERMIT_PACKAGE= Yes diff --git a/x11/xfce4/xfce4-wavelan/Makefile b/x11/xfce4/xfce4-wavelan/Makefile index 1ef97313d3d..86f02553dd0 100644 --- a/x11/xfce4/xfce4-wavelan/Makefile +++ b/x11/xfce4/xfce4-wavelan/Makefile @@ -3,7 +3,7 @@ COMMENT= Xfce4 wireless interface monitor panel plugin XFCE_VERSION= 0.6.3 XFCE_PLUGIN= wavelan XFCE_COMMIT= 56657a9cc08ce4da022db9233dcf3241aaf13794 -REVISION= 5 +REVISION= 6 # BSD PERMIT_PACKAGE= Yes diff --git a/x11/xfce4/xfce4.port.mk b/x11/xfce4/xfce4.port.mk index fd3374bfad5..3797b13f9b7 100644 --- a/x11/xfce4/xfce4.port.mk +++ b/x11/xfce4/xfce4.port.mk @@ -79,6 +79,8 @@ PORTROACH+= limitw:1,even .if defined(XFCE_COMMIT) DISTNAME = ${DISTNAME_GIT} MASTER_SITES = ${MASTER_SITES_GIT} +# makes sure some code is generated from .ui files +CONFIGURE_ARGS += --enable-maintainer-mode AUTOMAKE_VERSION = 1.14 AUTOCONF_VERSION = 2.69 MODXFCE4_gen = cd ${WRKSRC} && env NOCONFIGURE=yes \ @@ -91,7 +93,7 @@ BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ .endif .if defined(DEBUG) -CONFIGURE_ARGS += --enable-maintainer-mode --enable-debug +CONFIGURE_ARGS += --enable-debug .endif # remove useless .la file