Date: Thu, 22 Sep 2016 12:38:57 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422604 - in head/multimedia: . audacious audacious-gtk3 audacious/files Message-ID: <201609221238.u8MCcviE096630@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Thu Sep 22 12:38:57 2016 New Revision: 422604 URL: https://svnweb.freebsd.org/changeset/ports/422604 Log: - Update to 3.8 - Rewrite COMMENT and pkg-descr - Move pkg-message into files/ directory - Adjust dependencies (reported by QA script) - Replace CPPFLAGS and LDFLAGS by USES= localbase - Remove TOOLKITS option (delete all reference to QT5) and DBUS (mandatory now) - Re-generate patches (with 'make makepatch') Add multimedia/audacious-gtk3 port Added: head/multimedia/audacious-gtk3/ head/multimedia/audacious-gtk3/Makefile - copied, changed from r422603, head/multimedia/audacious/Makefile head/multimedia/audacious-gtk3/distinfo - copied, changed from r422603, head/multimedia/audacious/distinfo head/multimedia/audacious/files/patch-Makefile (contents, props changed) head/multimedia/audacious/files/pkg-message.in - copied unchanged from r422603, head/multimedia/audacious/pkg-message Deleted: head/multimedia/audacious/pkg-message Modified: head/multimedia/Makefile head/multimedia/audacious/Makefile head/multimedia/audacious/distinfo head/multimedia/audacious/files/patch-buildsys.mk.in head/multimedia/audacious/files/patch-extra.mk.in head/multimedia/audacious/files/patch-src_audtool_Makefile head/multimedia/audacious/pkg-descr head/multimedia/audacious/pkg-plist Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Thu Sep 22 12:17:04 2016 (r422603) +++ head/multimedia/Makefile Thu Sep 22 12:38:57 2016 (r422604) @@ -12,6 +12,7 @@ SUBDIR += assimp SUBDIR += atomicparsley SUBDIR += audacious + SUBDIR += audacious-gtk3 SUBDIR += audacious-plugins SUBDIR += audiopreview SUBDIR += avbin Copied and modified: head/multimedia/audacious-gtk3/Makefile (from r422603, head/multimedia/audacious/Makefile) ============================================================================== --- head/multimedia/audacious/Makefile Thu Sep 22 12:17:04 2016 (r422603, copy source) +++ head/multimedia/audacious-gtk3/Makefile Thu Sep 22 12:38:57 2016 (r422604) @@ -2,39 +2,42 @@ # $FreeBSD$ PORTNAME= audacious -PORTVERSION= 3.7.2 +PORTVERSION= 3.8 +DISTVERSIONSUFFIX= -gtk3 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ +PKGNAMESUFFIX= ${DISTVERSIONSUFFIX} MAINTAINER= olivierd@FreeBSD.org -COMMENT= Media player based on BMP and XMMS +COMMENT= Gtk+3 port of lightweight and versatile audio player LICENSE= GPLv3 +LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig + +CONFLICTS_INSTALL= audacious-3.* + +MASTERDIR= ${.CURDIR}/../audacious +DISTINFO_FILE= ${.CURDIR}/distinfo +SUB_FILES= pkg-message + GNU_CONFIGURE= yes USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \ - pkgconfig tar:bzip2 + localbase pkgconfig tar:bzip2 USE_XORG= x11 sm +USE_GNOME= gtk30 glib20 cairo USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes -CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig +CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ + --enable-gtk \ + --without-buildstamp -OPTIONS_MULTI= TOOLKITS -OPTIONS_MULTI_TOOLKITS= GTK2 QT5 -OPTIONS_EXCLUDE= QT5 -OPTIONS_DEFINE= DBUS ICONV NLS EXECINFO -OPTIONS_DEFAULT=DBUS GTK2 ICONV EXECINFO -DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib +OPTIONS_DEFINE= ICONV NLS EXECINFO +OPTIONS_DEFAULT=ICONV EXECINFO ICONV_USES= iconv -GTK2_USE= gnome=gtk20 -GTK2_IMPLIES= DBUS -GTK2_CONFIGURE_ENABLE= gtk -QT5_USE= qt5=core,gui,widgets -QT5_CONFIGURE_ENABLE= qt -QT5_IMPLIES= DBUS NLS_USES= gettext-runtime NLS_CONFIGURE_OFF= --disable-nls NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile @@ -51,6 +54,8 @@ post-patch: @${REINPLACE_CMD} 's|-laudcore|-laudcore -L${LOCALBASE}/lib -lexecinfo|' \ ${WRKSRC}/audacious.pc.in .endif + ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ + ${WRKSRC}/buildsys.mk.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* Copied and modified: head/multimedia/audacious-gtk3/distinfo (from r422603, head/multimedia/audacious/distinfo) ============================================================================== --- head/multimedia/audacious/distinfo Thu Sep 22 12:17:04 2016 (r422603, copy source) +++ head/multimedia/audacious-gtk3/distinfo Thu Sep 22 12:38:57 2016 (r422604) @@ -1,2 +1,3 @@ -SHA256 (audacious-3.7.2.tar.bz2) = 04f9eaba4522ce9674e6ed8afc7bd6b5fa9a1e240f8090589fc1874f6659f340 -SIZE (audacious-3.7.2.tar.bz2) = 572437 +TIMESTAMP = 1474531635 +SHA256 (audacious-3.8-gtk3.tar.bz2) = 38a5ba0c6e9d739a4bb5696c4178a45f4e3cb025905fdfb96654947593fbed66 +SIZE (audacious-3.8-gtk3.tar.bz2) = 589925 Modified: head/multimedia/audacious/Makefile ============================================================================== --- head/multimedia/audacious/Makefile Thu Sep 22 12:17:04 2016 (r422603) +++ head/multimedia/audacious/Makefile Thu Sep 22 12:38:57 2016 (r422604) @@ -2,39 +2,38 @@ # $FreeBSD$ PORTNAME= audacious -PORTVERSION= 3.7.2 +PORTVERSION= 3.8 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ MAINTAINER= olivierd@FreeBSD.org -COMMENT= Media player based on BMP and XMMS +COMMENT= Lightweight and versatile audio player LICENSE= GPLv3 +LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig + +CONFLICTS_INSTALL= audacious-gtk3-3.* + +SUB_FILES= pkg-message + GNU_CONFIGURE= yes USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \ - pkgconfig tar:bzip2 + localbase pkgconfig tar:bzip2 USE_XORG= x11 sm +USE_GNOME= gtk20 glib20 cairo USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes -CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig +CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ + --enable-gtk \ + --without-buildstamp -OPTIONS_MULTI= TOOLKITS -OPTIONS_MULTI_TOOLKITS= GTK2 QT5 -OPTIONS_EXCLUDE= QT5 -OPTIONS_DEFINE= DBUS ICONV NLS EXECINFO -OPTIONS_DEFAULT=DBUS GTK2 ICONV EXECINFO -DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib +OPTIONS_DEFINE= ICONV NLS EXECINFO +OPTIONS_DEFAULT=ICONV EXECINFO ICONV_USES= iconv -GTK2_USE= gnome=gtk20 -GTK2_IMPLIES= DBUS -GTK2_CONFIGURE_ENABLE= gtk -QT5_USE= qt5=core,gui,widgets -QT5_CONFIGURE_ENABLE= qt -QT5_IMPLIES= DBUS NLS_USES= gettext-runtime NLS_CONFIGURE_OFF= --disable-nls NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile @@ -51,6 +50,8 @@ post-patch: @${REINPLACE_CMD} 's|-laudcore|-laudcore -L${LOCALBASE}/lib -lexecinfo|' \ ${WRKSRC}/audacious.pc.in .endif + ${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ + ${WRKSRC}/buildsys.mk.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud* Modified: head/multimedia/audacious/distinfo ============================================================================== --- head/multimedia/audacious/distinfo Thu Sep 22 12:17:04 2016 (r422603) +++ head/multimedia/audacious/distinfo Thu Sep 22 12:38:57 2016 (r422604) @@ -1,2 +1,3 @@ -SHA256 (audacious-3.7.2.tar.bz2) = 04f9eaba4522ce9674e6ed8afc7bd6b5fa9a1e240f8090589fc1874f6659f340 -SIZE (audacious-3.7.2.tar.bz2) = 572437 +TIMESTAMP = 1474526743 +SHA256 (audacious-3.8.tar.bz2) = ffe8c0661dcb999598887e8ee05cd24faa7939086f5a8183fdba6210a95c4a71 +SIZE (audacious-3.8.tar.bz2) = 590222 Added: head/multimedia/audacious/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/audacious/files/patch-Makefile Thu Sep 22 12:38:57 2016 (r422604) @@ -0,0 +1,11 @@ +--- Makefile.orig 2016-08-24 14:50:57 UTC ++++ Makefile +@@ -14,6 +14,8 @@ DATA = AUTHORS \ + images/playlist.png \ + images/plugins.png + ++CONTRIB = contrib/audacious.appdata.xml ++ + include buildsys.mk + + install-extra: Modified: head/multimedia/audacious/files/patch-buildsys.mk.in ============================================================================== --- head/multimedia/audacious/files/patch-buildsys.mk.in Thu Sep 22 12:17:04 2016 (r422603) +++ head/multimedia/audacious/files/patch-buildsys.mk.in Thu Sep 22 12:38:57 2016 (r422604) @@ -1,6 +1,6 @@ ---- buildsys.mk.in.orig 2012-10-28 10:42:20.000000000 +0100 -+++ buildsys.mk.in 2012-10-28 10:43:37.000000000 +0100 -@@ -132,7 +132,7 @@ +--- buildsys.mk.in.orig 2016-08-24 14:50:57 UTC ++++ buildsys.mk.in +@@ -166,7 +166,7 @@ depend: pre-depend ${SRCS} done; \ if test x"$$regen" = x"1" -a x"$$deps" != x""; then \ ${DEPEND_STATUS}; \ @@ -9,7 +9,7 @@ rm -f $$deps; \ ${DEPEND_OK}; \ else \ -@@ -151,7 +151,7 @@ +@@ -205,7 +205,7 @@ pre-depend: ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} ${LINK_STATUS} @@ -18,3 +18,19 @@ ${LINK_OK}; \ else \ ${LINK_FAILED}; \ +@@ -604,6 +604,15 @@ install: install-extra + fi \ + done + ++ for i in ${CONTRIB}; do \ ++ ${INSTALL_STATUS}; \ ++ if ${MKDIR_P} ${DESTDIR}${datarootdir}/appdata && ${INSTALL} -m 644 $$i ${DESTDIR}${datarootdir}/appdata/$$(basename $$i); then \ ++ ${INSTALL_OK}; \ ++ else \ ++ ${INSTALL_FAILED}; \ ++ fi \ ++ done ++ + for i in ${PROG}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ Modified: head/multimedia/audacious/files/patch-extra.mk.in ============================================================================== --- head/multimedia/audacious/files/patch-extra.mk.in Thu Sep 22 12:17:04 2016 (r422603) +++ head/multimedia/audacious/files/patch-extra.mk.in Thu Sep 22 12:38:57 2016 (r422604) @@ -1,7 +1,10 @@ ---- extra.mk.in.orig 2014-06-19 16:24:45.729557751 +0200 -+++ extra.mk.in 2014-06-19 16:24:25.930403218 +0200 -@@ -12,3 +12,4 @@ +--- extra.mk.in.orig 2016-08-24 14:50:57 UTC ++++ extra.mk.in +@@ -12,6 +12,7 @@ GMODULE_LIBS ?= @GMODULE_LIBS@ + GTK_CFLAGS ?= @GTK_CFLAGS@ GTK_LIBS ?= @GTK_LIBS@ - LIBGUESS_CFLAGS ?= @LIBGUESS_CFLAGS@ - LIBGUESS_LIBS ?= @LIBGUESS_LIBS@ + QTCORE_CFLAGS ?= @QTCORE_CFLAGS@ +LIBINTL ?= @LIBINTL@ + QTCORE_LIBS ?= @QTCORE_LIBS@ + QT_CFLAGS ?= @QT_CFLAGS@ + QT_LIBS ?= @QT_LIBS@ Modified: head/multimedia/audacious/files/patch-src_audtool_Makefile ============================================================================== --- head/multimedia/audacious/files/patch-src_audtool_Makefile Thu Sep 22 12:17:04 2016 (r422603) +++ head/multimedia/audacious/files/patch-src_audtool_Makefile Thu Sep 22 12:38:57 2016 (r422604) @@ -1,6 +1,6 @@ ---- src/audtool/Makefile.orig 2014-06-19 16:33:05.570367015 +0200 -+++ src/audtool/Makefile 2014-06-19 16:33:24.317364894 +0200 -@@ -15,4 +15,4 @@ +--- src/audtool/Makefile.orig 2016-08-24 14:50:57 UTC ++++ src/audtool/Makefile +@@ -15,4 +15,4 @@ include ../../buildsys.mk include ../../extra.mk CPPFLAGS := -I../.. -I../dbus ${CPPFLAGS} ${GLIB_CFLAGS} ${GIO_CFLAGS} Copied: head/multimedia/audacious/files/pkg-message.in (from r422603, head/multimedia/audacious/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/audacious/files/pkg-message.in Thu Sep 22 12:38:57 2016 (r422604, copy of r422603, head/multimedia/audacious/pkg-message) @@ -0,0 +1,8 @@ +audacious supports Gzipped and uncompressed skins. If you would like to use +Zip format skins you will need to ensure archivers/unzip is installed. + + +ATTENTION! + + You should now go and install multimedia/audacious-plugins. Without it, + audacious is useless! Modified: head/multimedia/audacious/pkg-descr ============================================================================== --- head/multimedia/audacious/pkg-descr Thu Sep 22 12:17:04 2016 (r422603) +++ head/multimedia/audacious/pkg-descr Thu Sep 22 12:38:57 2016 (r422604) @@ -1,5 +1,5 @@ -Audacious is a fork of beep-media-player 0.9.7.1. -The primary goals of this fork are keeping ideology of original BMP -and merging miscellaneous plugins into Audacious +Audacious is an open source audio player. A descendant of XMMS, it plays +your music how you want it, without stealing away your computer's +resources from other tasks. WWW: http://audacious-media-player.org/ Modified: head/multimedia/audacious/pkg-plist ============================================================================== --- head/multimedia/audacious/pkg-plist Thu Sep 22 12:17:04 2016 (r422603) +++ head/multimedia/audacious/pkg-plist Thu Sep 22 12:38:57 2016 (r422604) @@ -1,10 +1,11 @@ bin/audacious -%%DBUS%%bin/audtool +bin/audtool include/audacious/audtag.h include/libaudcore/audio.h include/libaudcore/audstrings.h include/libaudcore/drct.h include/libaudcore/equalizer.h +include/libaudcore/export.h include/libaudcore/hook.h include/libaudcore/i18n.h include/libaudcore/index.h @@ -27,30 +28,23 @@ include/libaudcore/tuple.h include/libaudcore/vfs.h include/libaudcore/vfs_async.h include/libaudcore/visualizer.h -%%GTK2%%include/libaudgui/libaudgui-gtk.h -%%GTK2%%include/libaudgui/libaudgui.h -%%GTK2%%include/libaudgui/list.h -%%GTK2%%include/libaudgui/menu.h -%%QT5%%include/libaudqt/iface.h -%%QT5%%include/libaudqt/info-widget.h -%%QT5%%include/libaudqt/libaudqt.h -%%QT5%%include/libaudqt/menu.h -%%QT5%%include/libaudqt/volumebutton.h +include/libaudgui/libaudgui-gtk.h +include/libaudgui/libaudgui.h +include/libaudgui/list.h +include/libaudgui/menu.h lib/libaudcore.so -lib/libaudcore.so.3 -lib/libaudcore.so.3.1.0 -%%GTK2%%lib/libaudgui.so -%%GTK2%%lib/libaudgui.so.3 -%%GTK2%%lib/libaudgui.so.3.1.0 -%%QT5%%lib/libaudqt.so -%%QT5%%lib/libaudqt.so.0 -%%QT5%%lib/libaudqt.so.0.1.0 +lib/libaudcore.so.4 +lib/libaudcore.so.4.1.0 +lib/libaudgui.so +lib/libaudgui.so.4 +lib/libaudgui.so.4.1.0 lib/libaudtag.so -lib/libaudtag.so.2 -lib/libaudtag.so.2.1.0 +lib/libaudtag.so.3 +lib/libaudtag.so.3.0.0 libdata/pkgconfig/audacious.pc man/man1/audacious.1.gz man/man1/audtool.1.gz +share/appdata/audacious.appdata.xml share/applications/audacious.desktop %%DATADIR%%/AUTHORS %%DATADIR%%/COPYING
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609221238.u8MCcviE096630>