Re: git: 927ad383075a - main - net-p2p/amule: fix pkg-plist for AMULEGUI as well.

In reply to: Barbara Guida : "git: 927ad383075a - main - net-p2p/amule: fix pkg-plist for AMULEGUI as well."
Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Barbara <barbara.freebsd_at_gmail.com>
Date: Thu, 02 Dec 2021 14:33:42 UTC

I made a mistake, twice.
The correct PR should be PR: 260027.
Sorry for that.

Regards
Barbara Guida


On 11/26/21 08:07, Barbara Guida wrote:
> The branch main has been updated by bar:
>
> URL:https://cgit.FreeBSD.org/ports/commit/?id=927ad383075a183f711afb4b00d6c9539015ea41
>
> commit 927ad383075a183f711afb4b00d6c9539015ea41
> Author:     Barbara Guida<bar@FreeBSD.org>
> AuthorDate: 2021-11-26 06:59:49 +0000
> Commit:     Barbara Guida<bar@FreeBSD.org>
> CommitDate: 2021-11-26 06:59:49 +0000
>
>      net-p2p/amule: fix pkg-plist for AMULEGUI as well.
>      
>      While here, update WX from 2.8 to 3.0 because amulegui seems to not always work correctly with 2.8.
>      
>      PR:     26002
>      Reported by:echoxxzz@gmail.com
> ---
>   net-p2p/amule/Makefile  | 10 ++++++++--
>   net-p2p/amule/pkg-plist | 14 +++++++-------
>   2 files changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
> index eb09f8289294..ed4c495cb496 100644
> --- a/net-p2p/amule/Makefile
> +++ b/net-p2p/amule/Makefile
> @@ -2,7 +2,7 @@
>   
>   PORTNAME=	amule
>   PORTVERSION=	2.3.3
> -PORTREVISION=	1
> +PORTREVISION=	2
>   CATEGORIES=	net-p2p
>   MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
>   DISTNAME=	aMule-${PORTVERSION}
> @@ -20,7 +20,7 @@ CONFLICTS=	amule-devel
>   USES=		bison compiler:c++11-lang cpe desktop-file-utils gmake \
>   		localbase:ldflags perl5 pkgconfig shebangfix tar:xz
>   USE_PERL5=	build
> -USE_WX=		2.8
> +USE_WX=		3.0
>   WX_CONF_ARGS=	absolute
>   GNU_CONFIGURE=	yes
>   CONFIGURE_ARGS=	--with-denoise-level=0
> @@ -98,6 +98,12 @@ XAS_USE=	PERL5+=run
>   
>   .include <bsd.port.options.mk>
>   
> +.if ${PORT_OPTIONS:MAMULEGUI} || ${PORT_OPTIONS:MMONOLITHIC}
> +PLIST_SUB+=	AMULESKIN=""
> +.else
> +PLIST_SUB+=	AMULESKIN="@comment "
> +.endif
> +
>   post-patch:
>   	@${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
>   		-e '/if.*test/s/==/=/' \
> diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
> index 2de2e4dce85c..d368210cb8c8 100644
> --- a/net-p2p/amule/pkg-plist
> +++ b/net-p2p/amule/pkg-plist
> @@ -121,13 +121,13 @@
>   %%NLS%%%%ED2K%%man/zh_TW/man1/ed2k.1.gz
>   %%NLS%%%%WXCAS%%man/zh_TW/man1/wxcas.1.gz
>   %%NLS%%%%XAS%%man/zh_TW/man1/xas.1.gz
> -%%MONOLITHIC%%%%DATADIR%%/skins/Mac_Gray.zip
> -%%MONOLITHIC%%%%DATADIR%%/skins/gnome.zip
> -%%MONOLITHIC%%%%DATADIR%%/skins/kde4.zip
> -%%MONOLITHIC%%%%DATADIR%%/skins/papirus.zip
> -%%MONOLITHIC%%%%DATADIR%%/skins/priscilla.zip
> -%%MONOLITHIC%%%%DATADIR%%/skins/tango.zip
> -%%MONOLITHIC%%%%DATADIR%%/skins/xfce.zip
> +%%AMULESKIN%%%%DATADIR%%/skins/Mac_Gray.zip
> +%%AMULESKIN%%%%DATADIR%%/skins/gnome.zip
> +%%AMULESKIN%%%%DATADIR%%/skins/kde4.zip
> +%%AMULESKIN%%%%DATADIR%%/skins/papirus.zip
> +%%AMULESKIN%%%%DATADIR%%/skins/priscilla.zip
> +%%AMULESKIN%%%%DATADIR%%/skins/tango.zip
> +%%AMULESKIN%%%%DATADIR%%/skins/xfce.zip
>   %%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-dload.php
>   %%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-kad.php
>   %%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-log.php