From nobody Fri Nov 26 07:07:50 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C398B18B3D95; Fri, 26 Nov 2021 07:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J0m6G3QkVz3tQk; Fri, 26 Nov 2021 07:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4AE432C4D9; Fri, 26 Nov 2021 07:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AQ77o4p015593; Fri, 26 Nov 2021 07:07:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AQ77o75015592; Fri, 26 Nov 2021 07:07:50 GMT (envelope-from git) Date: Fri, 26 Nov 2021 07:07:50 GMT Message-Id: <202111260707.1AQ77o75015592@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Barbara Guida Subject: git: 927ad383075a - main - net-p2p/amule: fix pkg-plist for AMULEGUI as well. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bar X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 927ad383075a183f711afb4b00d6c9539015ea41 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637910470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZKDjoGuQB27UF0U26GEieOuyiNrSHOenTDIKE/N9PN0=; b=cmVuntf2gnlVs3P1eHL3nbi9XFZTlW3an0X8rWBeUpPED+a4ksMWqwTxyF6sMMfksFW3tx a338ehCDyKpEbJ6HdWVd8Wmw+cV9UYZBNVEIofEMg8n69OZomSJ5m9Da7WOdBe0FOQs3Kv YIJNleIq8bTB8nhmaOo4HHFDsJjaVbuwLNwOmAiT1bypyrTEv2t3ds280LQayFNz8DX0Mk CddJtNtZYAJ2f6sfKyI8iU4GZoHHdx6lNabZMDfY3ZjmJwEaAa4Kl4N/ixWSt6ZrckPJA1 3IfrwegTXaVlyTiTB7qD2UukQ9fHEzJhm+aLyU/jEpdGLSoZEysIG9+0bnvRrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637910470; a=rsa-sha256; cv=none; b=BuEimCzvR5uTGWyO05xmh3yEXTw2X2psuLrLhZohwDx59m8p82GdDUjNyLHfzviy3PRCY6 2WSoEBKyHA4GT+cylVW33iXXGm5CEnGI8T2ckcibZu5s9lgKqXywupGVxALstUujgFH+XA qn555jSJ89NkewIj1K8f0GGwEv4vxucGb6W9sGTgeTFgcyLK9LkKhqV5/2X2Fp6vyhsQ3g 2rJeoJoEPOjMcACkV6om7qQnUrgQDFGrn0qvPRGV69Ci6DdL49nUUTjgxRmC3zRESKtqFh HVe8quw1C2uh+e4QORZ/WFxMNj+98edodPQ4EH15wt1iBEWExt+uOf/HLxsSmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bar: URL: https://cgit.FreeBSD.org/ports/commit/?id=927ad383075a183f711afb4b00d6c9539015ea41 commit 927ad383075a183f711afb4b00d6c9539015ea41 Author: Barbara Guida AuthorDate: 2021-11-26 06:59:49 +0000 Commit: Barbara Guida 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 +.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