@@ -, +, @@ --- multimedia/audacious/Makefile (revision 479914) +++ multimedia/audacious/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= audacious -PORTVERSION= 3.9 -PORTREVISION= 1 +PORTVERSION= 3.10 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.audacious-media-player.org/ @@ -22,13 +21,13 @@ SUB_FILES= pkg-message USES= compiler:c++11-lib desktop-file-utils gettext-tools gmake \ - localbase pkgconfig tar:bzip2 -GNU_CONFIGURE= yes + gnome localbase pkgconfig tar:bzip2 USE_XORG= x11 sm USE_GNOME= gtk20 glib20 cairo USE_LDCONFIG= yes INSTALLS_ICONS= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --enable-gtk \ --without-buildstamp @@ -35,17 +34,21 @@ OPTIONS_DEFINE= ICONV NLS EXECINFO OPTIONS_DEFAULT=ICONV EXECINFO -ICONV_USES= iconv -NLS_USES= gettext-runtime -NLS_CONFIGURE_OFF= --disable-nls -NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile OPTIONS_SUB= yes EXECINFO_DESC= Build with libexecinfo support +ICONV_USES= iconv + +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls + post-patch: @${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \ ${WRKSRC}/buildsys.mk.in +post-patch-NLS-off: + ${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile + post-patch-EXECINFO-on: @${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \ ${WRKSRC}/src/audacious/Makefile --- multimedia/audacious/distinfo (revision 479914) +++ multimedia/audacious/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506360445 -SHA256 (audacious-3.9.tar.bz2) = 2d8044673ac786d71b08004f190bbca368258bf60e6602ffc0d9622835ccb05e -SIZE (audacious-3.9.tar.bz2) = 599488 +TIMESTAMP = 1537161628 +SHA256 (audacious-3.10.tar.bz2) = 6e4d49ac48a373c4c47d605fe18fbd5854bc30af6fece11331069af40eaa3fb5 +SIZE (audacious-3.10.tar.bz2) = 563531 --- multimedia/audacious/files/extra-patch-Makefile (revision 479914) +++ multimedia/audacious/files/extra-patch-Makefile (nonexistent) @@ -1,8 +0,0 @@ ---- Makefile.orig 2015-11-08 04:44:35 UTC -+++ Makefile -@@ -1,4 +1,4 @@ --SUBDIRS = src man images po -+SUBDIRS = src man images - - DISTCLEAN = audacious.pc buildsys.mk config.h config.log config.status extra.mk - --- multimedia/audacious/files/patch-buildsys.mk.in (revision 479914) +++ multimedia/audacious/files/patch-buildsys.mk.in (working copy) @@ -1,27 +1,29 @@ ---- buildsys.mk.in.orig 2016-08-24 14:50:57 UTC +--- buildsys.mk.in.orig 2018-09-17 05:25:40 UTC +++ buildsys.mk.in -@@ -166,7 +166,7 @@ depend: pre-depend ${SRCS} +@@ -180,7 +180,8 @@ depend: pre-depend ${SRCS} done; \ if test x"$$regen" = x"1" -a x"$$deps" != x""; then \ ${DEPEND_STATUS}; \ -- if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \ -+ if ${MAKE} ${MFLAGS} $$deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' $$deps >.deps; then \ +- if ${MAKE} $$deps && cat $$deps >.deps; then \ ++ if ${MAKE} $$deps && cat $$deps >.deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' \ ++ $$deps >.deps; then \ rm -f $$deps; \ ${DEPEND_OK}; \ else \ -@@ -205,7 +205,7 @@ pre-depend: - +@@ -220,7 +221,7 @@ pre-depend: ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} ${LINK_STATUS} + out="$@"; \ - if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \ + if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \ ${LINK_OK}; \ else \ ${LINK_FAILED}; \ -@@ -604,6 +604,15 @@ install: install-extra - fi \ - done - +@@ -664,6 +665,14 @@ install: install-extra + ${DIR_ENTER}; \ + ${MAKE} install || exit $$?; \ + ${DIR_LEAVE}; \ ++ done + for i in ${CONTRIB}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datarootdir}/appdata && ${INSTALL} -m 644 $$i ${DESTDIR}${datarootdir}/appdata/$$(basename $$i); then \ @@ -29,8 +31,6 @@ + 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 \ + done + + for i in "" ${SHARED_LIB}; do \ --- multimedia/audacious/pkg-plist (revision 479914) +++ multimedia/audacious/pkg-plist (working copy) @@ -34,13 +34,13 @@ include/libaudgui/menu.h lib/libaudcore.so lib/libaudcore.so.5 -lib/libaudcore.so.5.0.0 +lib/libaudcore.so.5.1.0 lib/libaudgui.so lib/libaudgui.so.5 lib/libaudgui.so.5.0.0 lib/libaudtag.so lib/libaudtag.so.3 -lib/libaudtag.so.3.0.0 +lib/libaudtag.so.%%GTK3_VERSION%% libdata/pkgconfig/audacious.pc man/man1/audacious.1.gz man/man1/audtool.1.gz @@ -48,19 +48,9 @@ share/applications/audacious.desktop %%DATADIR%%/AUTHORS %%DATADIR%%/COPYING -%%DATADIR%%/images/about-logo.png -%%DATADIR%%/images/about-logo.svg -%%DATADIR%%/images/album.png -%%DATADIR%%/images/appearance.png -%%DATADIR%%/images/audio.png -%%DATADIR%%/images/connectivity.png -%%DATADIR%%/images/info.png -%%DATADIR%%/images/playlist.png -%%DATADIR%%/images/plugins.png share/icons/hicolor/48x48/apps/audacious.png share/icons/hicolor/scalable/apps/audacious.svg %%NLS%%share/locale/ar/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo %%NLS%%share/locale/be/LC_MESSAGES/audacious.mo %%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo @@ -70,7 +60,6 @@ %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo %%NLS%%share/locale/el/LC_MESSAGES/audacious.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/eo/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo %%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo @@ -80,7 +69,6 @@ %%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/he/LC_MESSAGES/audacious.mo %%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo %%NLS%%share/locale/id_ID/LC_MESSAGES/audacious.mo %%NLS%%share/locale/it/LC_MESSAGES/audacious.mo @@ -99,14 +87,11 @@ %%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo %%NLS%%share/locale/si/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/sq/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/sr@latin/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious.mo %%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo %%NLS%%share/locale/ta/LC_MESSAGES/audacious.mo %%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo -%%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo