From nobody Thu May 19 12:34:07 2022 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 273A41B3B95A; Thu, 19 May 2022 12:34:08 +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 4L3q6S0L7cz3lLp; Thu, 19 May 2022 12:34:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652963648; 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=JD6x8n/TCt+MNnJ6iwmIhKaZ59MNlUDzb4Bk+R8RrgI=; b=mSqJactYpJ2yP8VlsCm1FptHvKLCQeq+kEjnmJ77Erwu6Z43MHlAQ+KWPFshvRwCdi4tNG IbJa6WgVgA6WFtkLk3MFbEyax22xMMPQysiT1/6ALfwum1yC9km1JGVbCtgs7ute4ghQR/ DPxCgp3AyFTxk9sEgPE3w8wgyBUK/MVO9N/HIFltoH7bibZYddHLIbINMghNjq/+AAQNiI jvwmR3ain9W+NG/jp+JHm4wQjhPcEa5C5wPREe+tWhVjv1ZQdTw+7jWGKkK6wEVmqFyHL8 UmjUQVv5qbvn0ZtujZPBYocSjUzSpkaiMjbFtMH8eLRtjd3VF7Y+mjB0KE32oQ== 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 DFDD91DB4B; Thu, 19 May 2022 12:34:07 +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 24JCY7JU006075; Thu, 19 May 2022 12:34:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JCY7TN006074; Thu, 19 May 2022 12:34:07 GMT (envelope-from git) Date: Thu, 19 May 2022 12:34:07 GMT Message-Id: <202205191234.24JCY7TN006074@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 03ff10027e28 - main - audio/libcanberra: split a gtk2 from non graphic port 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03ff10027e28f1047a3057b5c3615a9a4d324276 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652963648; 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=JD6x8n/TCt+MNnJ6iwmIhKaZ59MNlUDzb4Bk+R8RrgI=; b=A5IhxUjszY1s8884EWPwyBU7BvWs2MhFrIAB2WYYvToHDlm1N5WMuNuZe5tjMN7P2oP8ES AAo5vqzeWibs8wzoSb59lT42xy/Hu2tIJP8pY/6RP6tXmT6natBOMMpOvC+FYeUvsmFJ11 PgOQnuTnYd/q0pMMxL0h2Cu/bcVP/xNE+Sd3twmCTze43v2GoXJp3IzaM63HZUwONPqqfe HFSLOOZdp49KTrzHT4XlRQ7FmzPA9kKKTykv4xX/1ySbcBh7nGDszcKUiJVsU5HVK+SC62 MUUvKgNJSgksU52lnPtQBDU3Jq3ESAKLSyBFS+afO/oI7shvrwaCIYirqtSVDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652963648; a=rsa-sha256; cv=none; b=nFmWsw/kZNOPPurrJx5+HQLn2ejN2p3SE0mAagMWH5sSfuU34NZqHI8CsIex69kfd+ozoQ 7FFhfconcZ9m7LhdpdkyoCftsutmHEbFzcti58+Ynlqci0hjKlpg2zoizPk+AwXJr02tDK KaIxlrqVG0/E9iWnnmURrAor65ogGw7sxFzUaBP8IT9rjRWp4uhatkP7GynjV6eTXd+uw6 EEcn7eYdBcpy43KTes0AAJ7DOgqFnC5YHQJ9sN2FNTO0yaVAnx5qVJMWAfqbm8opA3u4J2 +GZWEf09RhVjjo+xPY6OA6MZ3vOO5KJV2ba50AKWRNeYSa5QAAuD3Qt6tgnmow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=03ff10027e28f1047a3057b5c3615a9a4d324276 commit 03ff10027e28f1047a3057b5c3615a9a4d324276 Author: Baptiste Daroussin AuthorDate: 2022-05-19 12:30:01 +0000 Commit: Baptiste Daroussin CommitDate: 2022-05-19 12:34:03 +0000 audio/libcanberra: split a gtk2 from non graphic port there was already a slave port for gtk3, now make a slaveport for gtk2 as well. While here fix the option definition which was wrongly done making libcanberra have no options at all while libcanberra-gtk3 had and the opposite was expected Use options helpers to simplify the port. Drop the gtkdoc by default bump revision and track no package for the 2 only port requiring the gtk2 library Reduce the slave port to its bare minimal requirement This change has been made in a slaveport instead of a flavor, because flavors depending on its own origin is not supported. this is a candidate for subpackages in the futur. note that this changes also removes gtk2 from the dependency path of many gtk3 only application --- audio/Makefile | 1 + audio/libcanberra-gtk2/Makefile | 7 ++++ audio/libcanberra-gtk3/Makefile | 25 +------------- audio/libcanberra-gtk3/pkg-plist | 6 ---- audio/libcanberra/Makefile | 52 ++++++++++++++-------------- audio/libcanberra/pkg-plist | 64 ++++++++++++++++------------------- games/gnubg/Makefile | 4 +-- mail/claws-mail-notification/Makefile | 4 +-- 8 files changed, 67 insertions(+), 96 deletions(-) diff --git a/audio/Makefile b/audio/Makefile index dfd0e46a77a6..aafd1d8fd88e 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -365,6 +365,7 @@ SUBDIR += libbpm SUBDIR += libbs2b SUBDIR += libcanberra + SUBDIR += libcanberra-gtk2 SUBDIR += libcanberra-gtk3 SUBDIR += libcdaudio SUBDIR += libcddb diff --git a/audio/libcanberra-gtk2/Makefile b/audio/libcanberra-gtk2/Makefile new file mode 100644 index 000000000000..80b43da73f6e --- /dev/null +++ b/audio/libcanberra-gtk2/Makefile @@ -0,0 +1,7 @@ +# Created by: Joe Marcus Clarke +# $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ + +MASTERDIR= ${.CURDIR:H}/libcanberra +SLAVEPORT= gtk2 + +.include "${MASTERDIR}/Makefile" diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile index cf04fbe60144..cccd151f3676 100644 --- a/audio/libcanberra-gtk3/Makefile +++ b/audio/libcanberra-gtk3/Makefile @@ -1,30 +1,7 @@ # Created by: Joe Marcus Clarke # $MCom: ports/trunk/audio/libcanberra-gtk3/Makefile 19814 2014-08-15 20:17:00Z gusi $ -CATEGORIES= audio devel -PKGNAMESUFFIX= -gtk3 - -MAINTAINER= desktop@FreeBSD.org -COMMENT= Implementation of the Freedesktop sound theme spec - -MASTERDIR= ${.CURDIR}/../../audio/libcanberra +MASTERDIR= ${.CURDIR:H}/libcanberra SLAVEPORT= gtk3 -PLIST= ${.CURDIR}/pkg-plist - -do-build: - cd ${WRKSRC} && ${GMAKE} libcanberra-gtk3.pc - cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3.la - cd ${WRKSRC}/src && ${GMAKE} libcanberra-gtk3-module.la - -do-install: - ${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ -.for i in .so .so.0 .so.0.1.9 - ${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \ - ${STAGEDIR}${PREFIX}/lib/ -.endfor - cd ${WRKSRC}/src && env DESTDIR=${STAGEDIR} ${GMAKE} install-gtk3moduleLTLIBRARIES - ${LN} -sf libcanberra-gtk3-module.so \ - ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules/libcanberra-gtk-module.so .include "${MASTERDIR}/Makefile" diff --git a/audio/libcanberra-gtk3/pkg-plist b/audio/libcanberra-gtk3/pkg-plist deleted file mode 100644 index d11f10495e16..000000000000 --- a/audio/libcanberra-gtk3/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -lib/gtk-3.0/modules/libcanberra-gtk-module.so -lib/gtk-3.0/modules/libcanberra-gtk3-module.so -lib/libcanberra-gtk3.so -lib/libcanberra-gtk3.so.0 -lib/libcanberra-gtk3.so.0.1.9 -libdata/pkgconfig/libcanberra-gtk3.pc diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 76b99d7bbe9d..4f2d3d9262a9 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -3,7 +3,7 @@ PORTNAME= libcanberra PORTVERSION= 0.30 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ \ http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/ @@ -17,47 +17,45 @@ LICENSE_FILE= ${WRKSRC}/LGPL LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libltdl.so:devel/libltdl -USES= gmake gnome libtool pathfix pkgconfig tar:xz +USES= gmake gnome localbase libtool pathfix pkgconfig tar:xz USE_GNOME= gnomeprefix gtk20 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -.if defined(SLAVEPORT) -OPTIONS_DEFINE= PULSEAUDIO GSTREAMER -.endif +SLAVEPORT?= PLIST_SUB= VERSION=${PORTVERSION} -.include - -.if defined(SLAVEPORT) +.if ${SLAVEPORT} != "" +PKGNAMESUFFIX= -${SLAVEPORT} +.endif +.if ${SLAVEPORT:U} == gtk3 USE_GNOME+= gtk30 LIB_DEPENDS+= libcanberra.so:audio/libcanberra -CONFIGURE_ARGS+=--enable-gtk3 -.else -CONFIGURE_ARGS+=--disable-gtk3 - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:audio/pulseaudio -PLIST_SUB+= PULSE="" +CONFIGURE_ARGS+= --enable-gtk3 \ + --disable-gtk +PLIST_SUB+= BASE="@comment " GTK3="" GTK2="@comment " +.elif ${SLAVEPORT:U} == gtk2 +USE_GNOME+= gnomeprefix gtk20 +LIB_DEPENDS+= libcanberra.so:audio/libcanberra +CONFIGURE_ARGS+= --enable-gtk \ + --disable-gtk3 +PLIST_SUB+= BASE="@comment " GTK3="@comment " GTK2="" .else -CONFIGURE_ARGS+=--disable-pulse -PLIST_SUB+= PULSE="@comment " +CONFIGURE_ARGS+= --disable-gtk \ + --disable-gtk3 +PLIST_SUB+= BASE="" GTK3="@comment " GTK2="@comment " +OPTIONS_DEFINE= PULSEAUDIO GSTREAMER +OPTIONS_SUB= yes .endif -.if ${PORT_OPTIONS:MGSTREAMER} -USES+= gstreamer -PLIST_SUB+= GSTREAMER="" -.else -CONFIGURE_ARGS+=--disable-gstreamer -PLIST_SUB+= GSTREAMER="@comment " -.endif +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO__CONFIGURE_ENABLE= pulse -.endif # end slaveport +GSTREAMER_USES= gstreamer +GSTREAMER_CONFIGURE_ENABLE= gstreamer post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist index f649156de2c2..e92f3d0a6c9a 100644 --- a/audio/libcanberra/pkg-plist +++ b/audio/libcanberra/pkg-plist @@ -1,35 +1,29 @@ -bin/canberra-gtk-play -include/canberra-gtk.h -include/canberra.h -lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop -lib/gtk-2.0/modules/libcanberra-gtk-module.so -lib/libcanberra-gtk.so -lib/libcanberra-gtk.so.0 -lib/libcanberra-gtk.so.0.1.9 -lib/libcanberra.so -lib/libcanberra.so.0 -lib/libcanberra.so.0.2.5 -%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so -lib/libcanberra-%%VERSION%%/libcanberra-multi.so -lib/libcanberra-%%VERSION%%/libcanberra-null.so -lib/libcanberra-%%VERSION%%/libcanberra-oss.so -%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so -libdata/pkgconfig/libcanberra-gtk.pc -libdata/pkgconfig/libcanberra.pc -%%DOCSDIR%%/README -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/libcanberra-canberra-gtk.html -%%DOCSDIR%%/libcanberra-canberra.html -%%DOCSDIR%%/libcanberra.devhelp2 -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png -share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop -share/gnome/autostart/libcanberra-login-sound.desktop -share/gnome/shutdown/libcanberra-logout-sound.sh -share/vala/vapi/libcanberra-gtk.vapi -share/vala/vapi/libcanberra.vapi +%%GTK2%%bin/canberra-gtk-play +%%GTK2%%include/canberra-gtk.h +%%BASE%%include/canberra.h +%%GTK2%%lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop +%%GTK2%%lib/gtk-2.0/modules/libcanberra-gtk-module.so +%%GTK3%%lib/gtk-3.0/modules/libcanberra-gtk-module.so +%%GTK3%%lib/gtk-3.0/modules/libcanberra-gtk3-module.so +%%GTK2%%lib/libcanberra-gtk.so +%%GTK2%%lib/libcanberra-gtk.so.0 +%%GTK2%%lib/libcanberra-gtk.so.0.1.9 +%%GTK3%%lib/libcanberra-gtk3.so +%%GTK3%%lib/libcanberra-gtk3.so.0 +%%GTK3%%lib/libcanberra-gtk3.so.0.1.9 +%%BASE%%lib/libcanberra.so +%%BASE%%lib/libcanberra.so.0 +%%BASE%%lib/libcanberra.so.0.2.5 +%%BASE%%%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so +%%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-multi.so +%%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-null.so +%%BASE%%lib/libcanberra-%%VERSION%%/libcanberra-oss.so +%%BASE%%%%PULSEAUDIO%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so +%%BASE%%libdata/pkgconfig/libcanberra.pc +%%GTK2%%libdata/pkgconfig/libcanberra-gtk.pc +%%GTK3%%libdata/pkgconfig/libcanberra-gtk3.pc +%%GTK2%%share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop +%%GTK2%%share/gnome/autostart/libcanberra-login-sound.desktop +%%GTK2%%share/gnome/shutdown/libcanberra-logout-sound.sh +%%GTK2%%share/vala/vapi/libcanberra-gtk.vapi +%%BASE%%share/vala/vapi/libcanberra.vapi diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile index 8b510d21e20e..09f8ed3fd5d4 100644 --- a/games/gnubg/Makefile +++ b/games/gnubg/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnubg PORTVERSION= 1.06.002 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= GNU DISTFILES= gnubg-release-${PORTVERSION}-sources.tar.gz @@ -15,7 +15,7 @@ LICENSE= GPLv3 RUN_DEPENDS= sqlite3:databases/sqlite3 LIB_DEPENDS= libpng.so:graphics/png \ libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \ - libcanberra-gtk.so:audio/libcanberra \ + libcanberra-gtk.so:audio/libcanberra-gtk \ libgmp.so:math/gmp \ libcurl.so:ftp/curl \ libfontconfig.so:x11-fonts/fontconfig \ diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile index 60c3554a6f3e..c1b3a0ed93b6 100644 --- a/mail/claws-mail-notification/Makefile +++ b/mail/claws-mail-notification/Makefile @@ -1,11 +1,11 @@ # Created by: Pawel Pekala PORTNAME= notification -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= New mail notification plugin for Claws Mail -LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \ +LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra-gtk2 \ libnotify.so:devel/libnotify CLAWS_PLUGINS_BUILD= ${PORTNAME}