View | Details | Raw Unified | Return to bug 231427 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/audacious/Makefile (-12 / +15 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	audacious
4
PORTNAME=	audacious
5
PORTVERSION=	3.9
5
PORTVERSION=	3.10
6
PORTREVISION=	1
7
CATEGORIES=	multimedia audio
6
CATEGORIES=	multimedia audio
8
MASTER_SITES=	http://distfiles.audacious-media-player.org/
7
MASTER_SITES=	http://distfiles.audacious-media-player.org/
9
8
Lines 17-34 Link Here
17
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
16
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
18
		libfontconfig.so:x11-fonts/fontconfig
17
		libfontconfig.so:x11-fonts/fontconfig
19
18
20
CONFLICTS_INSTALL=	audacious-gtk3-3.*
21
22
SUB_FILES=	pkg-message
23
24
USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake \
19
USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake \
25
		localbase pkgconfig tar:bzip2
20
		gnome localbase pkgconfig tar:bzip2
26
GNU_CONFIGURE=	yes
27
USE_XORG=	x11 sm
21
USE_XORG=	x11 sm
28
USE_GNOME=	gtk20 glib20 cairo
22
USE_GNOME=	gtk20 glib20 cairo
29
USE_LDCONFIG=	yes
23
USE_LDCONFIG=	yes
24
25
GNU_CONFIGURE=	yes
30
INSTALLS_ICONS=	yes
26
INSTALLS_ICONS=	yes
27
SUB_FILES=	pkg-message
31
28
29
CONFLICTS_INSTALL=	audacious-gtk3-3.*
30
32
CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
31
CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
33
		--enable-gtk \
32
		--enable-gtk \
34
		--without-buildstamp
33
		--without-buildstamp
Lines 35-51 Link Here
35
34
36
OPTIONS_DEFINE=	ICONV NLS EXECINFO
35
OPTIONS_DEFINE=	ICONV NLS EXECINFO
37
OPTIONS_DEFAULT=ICONV EXECINFO
36
OPTIONS_DEFAULT=ICONV EXECINFO
38
ICONV_USES=	iconv
39
NLS_USES=	gettext-runtime
40
NLS_CONFIGURE_OFF=	--disable-nls
41
NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
42
OPTIONS_SUB=	yes
37
OPTIONS_SUB=	yes
43
EXECINFO_DESC=	Build with libexecinfo support
38
EXECINFO_DESC=	Build with libexecinfo support
44
39
40
ICONV_USES=	iconv
41
42
NLS_USES=	gettext-runtime
43
NLS_CONFIGURE_ENABLE=	nls
44
45
post-patch:
45
post-patch:
46
	@${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \
46
	@${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \
47
		${WRKSRC}/buildsys.mk.in
47
		${WRKSRC}/buildsys.mk.in
48
48
49
post-patch-NLS-off:
50
	${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile
51
49
post-patch-EXECINFO-on:
52
post-patch-EXECINFO-on:
50
	@${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \
53
	@${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \
51
		${WRKSRC}/src/audacious/Makefile
54
		${WRKSRC}/src/audacious/Makefile
(-)multimedia/audacious/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1506360445
1
TIMESTAMP = 1537161628
2
SHA256 (audacious-3.9.tar.bz2) = 2d8044673ac786d71b08004f190bbca368258bf60e6602ffc0d9622835ccb05e
2
SHA256 (audacious-3.10.tar.bz2) = 6e4d49ac48a373c4c47d605fe18fbd5854bc30af6fece11331069af40eaa3fb5
3
SIZE (audacious-3.9.tar.bz2) = 599488
3
SIZE (audacious-3.10.tar.bz2) = 563531
(-)multimedia/audacious/files/extra-patch-Makefile (-8 lines)
Lines 1-8 Link Here
1
--- Makefile.orig	2015-11-08 04:44:35 UTC
2
+++ Makefile
3
@@ -1,4 +1,4 @@
4
-SUBDIRS = src man images po
5
+SUBDIRS = src man images
6
 
7
 DISTCLEAN = audacious.pc buildsys.mk config.h config.log config.status extra.mk
8
 
(-)multimedia/audacious/files/patch-buildsys.mk.in (-15 / +15 lines)
Lines 1-27 Link Here
1
--- buildsys.mk.in.orig	2016-08-24 14:50:57 UTC
1
--- buildsys.mk.in.orig	2018-09-17 05:25:40 UTC
2
+++ buildsys.mk.in
2
+++ buildsys.mk.in
3
@@ -166,7 +166,7 @@ depend: pre-depend ${SRCS}
3
@@ -180,7 +180,8 @@ depend: pre-depend ${SRCS}
4
 	done; \
4
 	done; \
5
 	if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
5
 	if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
6
 		${DEPEND_STATUS}; \
6
 		${DEPEND_STATUS}; \
7
-		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
7
-		if ${MAKE} $$deps && cat $$deps >.deps; then \
8
+		if ${MAKE} ${MFLAGS} $$deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' $$deps >.deps; then \
8
+		if ${MAKE} $$deps && cat $$deps >.deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' \
9
+		$$deps >.deps; then \
9
 			rm -f $$deps; \
10
 			rm -f $$deps; \
10
 			${DEPEND_OK}; \
11
 			${DEPEND_OK}; \
11
 		else \
12
 		else \
12
@@ -205,7 +205,7 @@ pre-depend:
13
@@ -220,7 +221,7 @@ pre-depend:
13
 
14
 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
14
 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
15
 	${LINK_STATUS}
15
 	${LINK_STATUS}
16
 	out="$@"; \
16
-	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
17
-	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
17
+	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \
18
+	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \
18
 		${LINK_OK}; \
19
 		${LINK_OK}; \
19
 	else \
20
 	else \
20
 		${LINK_FAILED}; \
21
 		${LINK_FAILED}; \
21
@@ -604,6 +604,15 @@ install: install-extra
22
@@ -664,6 +665,14 @@ install: install-extra
22
 		fi \
23
 		${DIR_ENTER}; \
23
 	done
24
 		${MAKE} install || exit $$?; \
24
 
25
 		${DIR_LEAVE}; \
26
+	done
25
+	for i in ${CONTRIB}; do \
27
+	for i in ${CONTRIB}; do \
26
+		${INSTALL_STATUS}; \
28
+		${INSTALL_STATUS}; \
27
+		if ${MKDIR_P} ${DESTDIR}${datarootdir}/appdata && ${INSTALL} -m 644 $$i ${DESTDIR}${datarootdir}/appdata/$$(basename $$i); then \
29
+		if ${MKDIR_P} ${DESTDIR}${datarootdir}/appdata && ${INSTALL} -m 644 $$i ${DESTDIR}${datarootdir}/appdata/$$(basename $$i); then \
Lines 29-36 Link Here
29
+		else \
31
+		else \
30
+			${INSTALL_FAILED}; \
32
+			${INSTALL_FAILED}; \
31
+		fi \
33
+		fi \
32
+	done
34
 	done
33
+
35
 
34
 	for i in ${PROG}; do \
36
 	for i in "" ${SHARED_LIB}; do \
35
 		${INSTALL_STATUS}; \
36
 		if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
(-)multimedia/audacious/pkg-plist (-17 / +2 lines)
Lines 34-46 Link Here
34
include/libaudgui/menu.h
34
include/libaudgui/menu.h
35
lib/libaudcore.so
35
lib/libaudcore.so
36
lib/libaudcore.so.5
36
lib/libaudcore.so.5
37
lib/libaudcore.so.5.0.0
37
lib/libaudcore.so.5.1.0
38
lib/libaudgui.so
38
lib/libaudgui.so
39
lib/libaudgui.so.5
39
lib/libaudgui.so.5
40
lib/libaudgui.so.5.0.0
40
lib/libaudgui.so.5.0.0
41
lib/libaudtag.so
41
lib/libaudtag.so
42
lib/libaudtag.so.3
42
lib/libaudtag.so.3
43
lib/libaudtag.so.3.0.0
43
lib/libaudtag.so.%%GTK3_VERSION%%
44
libdata/pkgconfig/audacious.pc
44
libdata/pkgconfig/audacious.pc
45
man/man1/audacious.1.gz
45
man/man1/audacious.1.gz
46
man/man1/audtool.1.gz
46
man/man1/audtool.1.gz
Lines 48-66 Link Here
48
share/applications/audacious.desktop
48
share/applications/audacious.desktop
49
%%DATADIR%%/AUTHORS
49
%%DATADIR%%/AUTHORS
50
%%DATADIR%%/COPYING
50
%%DATADIR%%/COPYING
51
%%DATADIR%%/images/about-logo.png
52
%%DATADIR%%/images/about-logo.svg
53
%%DATADIR%%/images/album.png
54
%%DATADIR%%/images/appearance.png
55
%%DATADIR%%/images/audio.png
56
%%DATADIR%%/images/connectivity.png
57
%%DATADIR%%/images/info.png
58
%%DATADIR%%/images/playlist.png
59
%%DATADIR%%/images/plugins.png
60
share/icons/hicolor/48x48/apps/audacious.png
51
share/icons/hicolor/48x48/apps/audacious.png
61
share/icons/hicolor/scalable/apps/audacious.svg
52
share/icons/hicolor/scalable/apps/audacious.svg
62
%%NLS%%share/locale/ar/LC_MESSAGES/audacious.mo
53
%%NLS%%share/locale/ar/LC_MESSAGES/audacious.mo
63
%%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo
64
%%NLS%%share/locale/be/LC_MESSAGES/audacious.mo
54
%%NLS%%share/locale/be/LC_MESSAGES/audacious.mo
65
%%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo
55
%%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo
66
%%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo
56
%%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo
Lines 70-76 Link Here
70
%%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
60
%%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
71
%%NLS%%share/locale/el/LC_MESSAGES/audacious.mo
61
%%NLS%%share/locale/el/LC_MESSAGES/audacious.mo
72
%%NLS%%share/locale/en_GB/LC_MESSAGES/audacious.mo
62
%%NLS%%share/locale/en_GB/LC_MESSAGES/audacious.mo
73
%%NLS%%share/locale/eo/LC_MESSAGES/audacious.mo
74
%%NLS%%share/locale/es/LC_MESSAGES/audacious.mo
63
%%NLS%%share/locale/es/LC_MESSAGES/audacious.mo
75
%%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo
64
%%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo
76
%%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo
65
%%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo
Lines 80-86 Link Here
80
%%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
69
%%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
81
%%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
70
%%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
82
%%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo
71
%%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo
83
%%NLS%%share/locale/he/LC_MESSAGES/audacious.mo
84
%%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
72
%%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
85
%%NLS%%share/locale/id_ID/LC_MESSAGES/audacious.mo
73
%%NLS%%share/locale/id_ID/LC_MESSAGES/audacious.mo
86
%%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
74
%%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
Lines 99-112 Link Here
99
%%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo
87
%%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo
100
%%NLS%%share/locale/si/LC_MESSAGES/audacious.mo
88
%%NLS%%share/locale/si/LC_MESSAGES/audacious.mo
101
%%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo
89
%%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo
102
%%NLS%%share/locale/sq/LC_MESSAGES/audacious.mo
103
%%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo
90
%%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo
104
%%NLS%%share/locale/sr@latin/LC_MESSAGES/audacious.mo
105
%%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious.mo
91
%%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious.mo
106
%%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo
92
%%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo
107
%%NLS%%share/locale/ta/LC_MESSAGES/audacious.mo
93
%%NLS%%share/locale/ta/LC_MESSAGES/audacious.mo
108
%%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo
94
%%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo
109
%%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
95
%%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
110
%%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo
111
%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
96
%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
112
%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
97
%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
(-)multimedia/audacious-gtk3/Makefile (-11 / +12 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	audacious
4
PORTNAME=	audacious
5
PORTVERSION=	3.9
5
PORTVERSION=	3.10
6
PORTREVISION=	1
7
DISTVERSIONSUFFIX=	-gtk3
6
DISTVERSIONSUFFIX=	-gtk3
8
CATEGORIES=	multimedia audio
7
CATEGORIES=	multimedia audio
9
#MASTER_SITES=	http://distfiles.audacious-media-player.org/
8
#MASTER_SITES=	http://distfiles.audacious-media-player.org/
Lines 15-21 Link Here
15
LICENSE=	GPLv3
14
LICENSE=	GPLv3
16
15
17
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
16
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
18
	libfontconfig.so:x11-fonts/fontconfig
17
		libfontconfig.so:x11-fonts/fontconfig
19
18
20
CONFLICTS_INSTALL=	audacious-3.*
19
CONFLICTS_INSTALL=	audacious-3.*
21
20
Lines 22-27 Link Here
22
MASTERDIR=	${.CURDIR}/../audacious
21
MASTERDIR=	${.CURDIR}/../audacious
23
DISTINFO_FILE=	${.CURDIR}/distinfo
22
DISTINFO_FILE=	${.CURDIR}/distinfo
24
FILESDIR=	${MASTERDIR}/files
23
FILESDIR=	${MASTERDIR}/files
24
PATCHDIR=	${.CURDIR}/files
25
PLIST=		${.CURDIR}/pkg-plist
25
SUB_FILES=	pkg-message
26
SUB_FILES=	pkg-message
26
27
27
USES=		autoreconf compiler:c++11-lib desktop-file-utils \
28
USES=		autoreconf compiler:c++11-lib desktop-file-utils \
Lines 45-66 Link Here
45
OPTIONS_DEFAULT=ICONV EXECINFO
46
OPTIONS_DEFAULT=ICONV EXECINFO
46
ICONV_USES=	iconv
47
ICONV_USES=	iconv
47
NLS_USES=	gettext-runtime
48
NLS_USES=	gettext-runtime
48
NLS_CONFIGURE_OFF=	--disable-nls
49
NLS_CONFIGURE_ENABLE=	nls
49
NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
50
OPTIONS_SUB=	yes
50
OPTIONS_SUB=	yes
51
EXECINFO_DESC=	Build with libexecinfo support
51
EXECINFO_DESC=	Build with libexecinfo support
52
52
53
.include <bsd.port.options.mk>
53
post-patch:
54
	${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \
55
		${WRKSRC}/buildsys.mk.in
54
56
55
post-patch:
57
post-patch-NLS-off:
56
.if  ${PORT_OPTIONS:MEXECINFO}
58
	${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile
59
60
post-patch-EXECINFO-on:
57
	@${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \
61
	@${REINPLACE_CMD} 's|-lm |-lm -lexecinfo |' \
58
		${WRKSRC}/src/audacious/Makefile
62
		${WRKSRC}/src/audacious/Makefile
59
	@${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \
63
	@${REINPLACE_CMD} 's|-laudcore|-laudcore -lexecinfo|' \
60
		${WRKSRC}/audacious.pc.in
64
		${WRKSRC}/audacious.pc.in
61
.endif
62
	${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \
63
		${WRKSRC}/buildsys.mk.in
64
65
65
post-install:
66
post-install:
66
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud*
67
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud*
(-)multimedia/audacious-gtk3/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1506368343
1
TIMESTAMP = 1537199364
2
SHA256 (audacious-media-player-audacious-3.9-gtk3-7a490de_GH0.tar.gz) = 3a105932ad8d3489fdd9ea4fa845211388638a3da92182d6445c5d3b31678115
2
SHA256 (audacious-media-player-audacious-3.10-gtk3-7a490de_GH0.tar.gz) = 3a105932ad8d3489fdd9ea4fa845211388638a3da92182d6445c5d3b31678115
3
SIZE (audacious-media-player-audacious-3.9-gtk3-7a490de_GH0.tar.gz) = 860819
3
SIZE (audacious-media-player-audacious-3.10-gtk3-7a490de_GH0.tar.gz) = 860819
(-)multimedia/audacious-gtk3/files/patch-buildsys.mk.in (-28 / +4 lines)
Lines 1-36 Link Here
1
--- buildsys.mk.in.orig	2016-08-24 14:50:57 UTC
1
--- buildsys.mk.in.orig	2017-08-20 01:46:10 UTC
2
+++ buildsys.mk.in
2
+++ buildsys.mk.in
3
@@ -166,7 +166,7 @@ depend: pre-depend ${SRCS}
3
@@ -166,7 +166,8 @@ depend: pre-depend ${SRCS}
4
 	done; \
4
 	done; \
5
 	if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
5
 	if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
6
 		${DEPEND_STATUS}; \
6
 		${DEPEND_STATUS}; \
7
-		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
7
-		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
8
+		if ${MAKE} ${MFLAGS} $$deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' $$deps >.deps; then \
8
+		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' \
9
+		$$deps >.deps; then \
9
 			rm -f $$deps; \
10
 			rm -f $$deps; \
10
 			${DEPEND_OK}; \
11
 			${DEPEND_OK}; \
11
 		else \
12
 		else \
12
@@ -205,7 +205,7 @@ pre-depend:
13
 
14
 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
15
 	${LINK_STATUS}
16
-	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
17
+	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \
18
 		${LINK_OK}; \
19
 	else \
20
 		${LINK_FAILED}; \
21
@@ -604,6 +604,15 @@ install: install-extra
22
 		fi \
23
 	done
24
 
25
+	for i in ${CONTRIB}; do \
26
+		${INSTALL_STATUS}; \
27
+		if ${MKDIR_P} ${DESTDIR}${datarootdir}/appdata && ${INSTALL} -m 644 $$i ${DESTDIR}${datarootdir}/appdata/$$(basename $$i); then \
28
+			${INSTALL_OK}; \
29
+		else \
30
+			${INSTALL_FAILED}; \
31
+		fi \
32
+	done
33
+
34
 	for i in ${PROG}; do \
35
 		${INSTALL_STATUS}; \
36
 		if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
(-)multimedia/audacious-gtk3/pkg-plist (-2 / +1 lines)
Lines 40-50 Link Here
40
lib/libaudgui.so.5.0.0
40
lib/libaudgui.so.5.0.0
41
lib/libaudtag.so
41
lib/libaudtag.so
42
lib/libaudtag.so.3
42
lib/libaudtag.so.3
43
lib/libaudtag.so.3.0.0
43
lib/libaudtag.so.%%GTK3_VERSION%%
44
libdata/pkgconfig/audacious.pc
44
libdata/pkgconfig/audacious.pc
45
man/man1/audacious.1.gz
45
man/man1/audacious.1.gz
46
man/man1/audtool.1.gz
46
man/man1/audtool.1.gz
47
share/appdata/audacious.appdata.xml
48
share/applications/audacious.desktop
47
share/applications/audacious.desktop
49
%%DATADIR%%/AUTHORS
48
%%DATADIR%%/AUTHORS
50
%%DATADIR%%/COPYING
49
%%DATADIR%%/COPYING
(-)multimedia/audacious-plugins/Makefile (-8 / +8 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	audacious-plugins
4
PORTNAME=	audacious-plugins
5
PORTVERSION=	3.9
5
PORTVERSION=	3.10
6
PORTREVISION=	5
7
CATEGORIES=	multimedia audio
6
CATEGORIES=	multimedia audio
8
MASTER_SITES=	http://distfiles.audacious-media-player.org/
7
MASTER_SITES=	http://distfiles.audacious-media-player.org/
9
8
Lines 20-34 Link Here
20
		libfreetype.so:print/freetype2
19
		libfreetype.so:print/freetype2
21
RUN_DEPENDS=	audacious:multimedia/audacious
20
RUN_DEPENDS=	audacious:multimedia/audacious
22
21
23
CONFLICTS_INSTALL=	audacious-plugins-gtk3-3.*
24
25
USES=		compiler:c++11-lib gettext-tools gmake iconv \
22
USES=		compiler:c++11-lib gettext-tools gmake iconv \
26
		localbase pkgconfig tar:bzip2
23
		localbase pkgconfig tar:bzip2
27
GNU_CONFIGURE=	yes
28
USE_LDCONFIG=	yes
29
USE_GNOME=	gtk20 glib20 libxml2 cairo gdkpixbuf2
24
USE_GNOME=	gtk20 glib20 libxml2 cairo gdkpixbuf2
30
USE_XORG=	x11
25
USE_XORG=	x11
31
26
27
CONFLICTS_INSTALL=	audacious-plugins-gtk3-3.*
28
29
GNU_CONFIGURE=	yes
32
CONFIGURE_ARGS=	--disable-console --disable-sndio --disable-soxr \
30
CONFIGURE_ARGS=	--disable-console --disable-sndio --disable-soxr \
33
		--enable-gnomeshortcuts \
31
		--enable-gnomeshortcuts \
34
		--enable-gtk --enable-filewriter --enable-hotkey
32
		--enable-gtk --enable-filewriter --enable-hotkey
Lines 80-87 Link Here
80
NEON_LIB_DEPENDS=	libneon.so:www/neon
78
NEON_LIB_DEPENDS=	libneon.so:www/neon
81
NEON_CONFIGURE_OFF=	--disable-neon
79
NEON_CONFIGURE_OFF=	--disable-neon
82
NLS_USES=		gettext-runtime
80
NLS_USES=		gettext-runtime
83
NLS_CONFIGURE_OFF=	--disable-nls
81
NLS_CONFIGURE_ENABLE=	nls
84
NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
85
NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
82
NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
86
NOTIFY_CONFIGURE_ENABLE=	notify
83
NOTIFY_CONFIGURE_ENABLE=	notify
87
OPENGL_USE=		xorg=x11 gl=gl
84
OPENGL_USE=		xorg=x11 gl=gl
Lines 124-129 Link Here
124
	@${FIND} ${WRKSRC} -type f -name 'Makefile' \
121
	@${FIND} ${WRKSRC} -type f -name 'Makefile' \
125
		| ${XARGS} ${REINPLACE_CMD} -e 's| -Wno-bool-operation||'
122
		| ${XARGS} ${REINPLACE_CMD} -e 's| -Wno-bool-operation||'
126
123
124
post-patch-NLS-off:
125
	${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile
126
127
post-install:
127
post-install:
128
	@${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \
128
	@${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \
129
		-exec ${STRIP_CMD} {} \;
129
		-exec ${STRIP_CMD} {} \;
(-)multimedia/audacious-plugins/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1506363579
1
TIMESTAMP = 1537198433
2
SHA256 (audacious-plugins-3.9.tar.bz2) = 8bf7f21089cb3406968cc9c71307774aee7100ec4607f28f63cf5690d5c927b8
2
SHA256 (audacious-plugins-3.10.tar.bz2) = 5061ebb20169eb4d3f15aafbe83b43363762dc8d19ca0cd83f5556dc577e618f
3
SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
3
SIZE (audacious-plugins-3.10.tar.bz2) = 1701877
(-)multimedia/audacious-plugins/files/extra-patch-Makefile (-8 lines)
Lines 1-8 Link Here
1
--- Makefile.orig	2015-11-07 23:04:08 UTC
2
+++ Makefile
3
@@ -1,4 +1,4 @@
4
-SUBDIRS = src po
5
+SUBDIRS = src
6
 
7
 DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk
8
 
(-)multimedia/audacious-plugins/files/patch-buildsys.mk.in (-11 lines)
Lines 1-11 Link Here
1
--- buildsys.mk.in.orig	2016-09-22 01:16:40 UTC
2
+++ buildsys.mk.in
3
@@ -205,7 +205,7 @@ pre-depend:
4
 
5
 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
6
 	${LINK_STATUS}
7
-	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
8
+	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \
9
 		${LINK_OK}; \
10
 	else \
11
 		${LINK_FAILED}; \
(-)multimedia/audacious-plugins/pkg-plist (-2 lines)
Lines 22-28 Link Here
22
%%AOSD%%lib/audacious/General/aosd.so
22
%%AOSD%%lib/audacious/General/aosd.so
23
%%CDDA%%lib/audacious/General/cd-menu-items.so
23
%%CDDA%%lib/audacious/General/cd-menu-items.so
24
lib/audacious/General/delete-files.so
24
lib/audacious/General/delete-files.so
25
lib/audacious/General/gnomeshortcuts.so
26
lib/audacious/General/gtkui.so
25
lib/audacious/General/gtkui.so
27
lib/audacious/General/hotkey.so
26
lib/audacious/General/hotkey.so
28
%%LIRC%%lib/audacious/General/lirc.so
27
%%LIRC%%lib/audacious/General/lirc.so
Lines 36-42 Link Here
36
lib/audacious/General/song_change.so
35
lib/audacious/General/song_change.so
37
lib/audacious/General/statusicon.so
36
lib/audacious/General/statusicon.so
38
%%AAC%%lib/audacious/Input/aac-raw.so
37
%%AAC%%lib/audacious/Input/aac-raw.so
39
lib/audacious/Input/adplug.so
40
%%AMIDI%%lib/audacious/Input/amidi-plug.so
38
%%AMIDI%%lib/audacious/Input/amidi-plug.so
41
%%CDDA%%lib/audacious/Input/cdaudio-ng.so
39
%%CDDA%%lib/audacious/Input/cdaudio-ng.so
42
%%FFMPEG%%lib/audacious/Input/ffaudio.so
40
%%FFMPEG%%lib/audacious/Input/ffaudio.so
(-)multimedia/audacious-plugins-gtk3/Makefile (-8 / +9 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	audacious-plugins
4
PORTNAME=	audacious-plugins
5
PORTVERSION=	3.9
5
PORTVERSION=	3.10
6
DISTVERSIONSUFFIX=	-gtk3
6
DISTVERSIONSUFFIX=	-gtk3
7
PORTREVISION=	5
8
CATEGORIES=	multimedia audio
7
CATEGORIES=	multimedia audio
9
#MASTER_SITES=	http://distfiles.audacious-media-player.org/
8
#MASTER_SITES=	http://distfiles.audacious-media-player.org/
10
PKGNAMESUFFIX=	${DISTVERSIONSUFFIX}
9
PKGNAMESUFFIX=	${DISTVERSIONSUFFIX}
Lines 16-24 Link Here
16
15
17
BUILD_DEPENDS=	audacious:multimedia/audacious-gtk3
16
BUILD_DEPENDS=	audacious:multimedia/audacious-gtk3
18
LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
17
LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
19
	libdbus-1.so:devel/dbus \
18
		libdbus-1.so:devel/dbus \
20
	libfontconfig.so:x11-fonts/fontconfig \
19
		libfontconfig.so:x11-fonts/fontconfig \
21
	libfreetype.so:print/freetype2
20
		libfreetype.so:print/freetype2
22
RUN_DEPENDS=	audacious:multimedia/audacious-gtk3
21
RUN_DEPENDS=	audacious:multimedia/audacious-gtk3
23
22
24
CONFLICTS_INSTALL=	audacious-plugins-3.*
23
CONFLICTS_INSTALL=	audacious-plugins-3.*
Lines 25-30 Link Here
25
24
26
MASTERDIR=	${.CURDIR}/../audacious-plugins
25
MASTERDIR=	${.CURDIR}/../audacious-plugins
27
DISTINFO_FILE=	${.CURDIR}/distinfo
26
DISTINFO_FILE=	${.CURDIR}/distinfo
27
PLIST=		${.CURDIR}/pkg-plist
28
FILESDIR=	${MASTERDIR}/files
28
FILESDIR=	${MASTERDIR}/files
29
29
30
USES=		autoreconf compiler:c++11-lib gettext-tools gmake iconv \
30
USES=		autoreconf compiler:c++11-lib gettext-tools gmake iconv \
Lines 35-41 Link Here
35
GH_TAGNAME=	9c44e5e
35
GH_TAGNAME=	9c44e5e
36
36
37
GNU_CONFIGURE=	yes
37
GNU_CONFIGURE=	yes
38
USE_LDCONFIG=	yes
39
USE_GNOME=	gtk30 glib20 libxml2 cairo gdkpixbuf2
38
USE_GNOME=	gtk30 glib20 libxml2 cairo gdkpixbuf2
40
USE_XORG=	x11
39
USE_XORG=	x11
41
40
Lines 90-97 Link Here
90
NEON_LIB_DEPENDS=	libneon.so:www/neon
89
NEON_LIB_DEPENDS=	libneon.so:www/neon
91
NEON_CONFIGURE_OFF=	--disable-neon
90
NEON_CONFIGURE_OFF=	--disable-neon
92
NLS_USES=	gettext-runtime
91
NLS_USES=	gettext-runtime
93
NLS_CONFIGURE_OFF=	--disable-nls
92
NLS_CONFIGURE_ENABLE=	nls
94
NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
95
NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
93
NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
96
NOTIFY_CONFIGURE_ENABLE=	notify
94
NOTIFY_CONFIGURE_ENABLE=	notify
97
OPENGL_USE=	xorg=x11 gl=gl
95
OPENGL_USE=	xorg=x11 gl=gl
Lines 134-139 Link Here
134
	${FIND} ${WRKSRC} -type f -name 'Makefile' \
132
	${FIND} ${WRKSRC} -type f -name 'Makefile' \
135
		| ${XARGS} ${REINPLACE_CMD} -e 's| -Wno-bool-operation||'
133
		| ${XARGS} ${REINPLACE_CMD} -e 's| -Wno-bool-operation||'
136
134
135
post-patch-NLS-off:
136
	${REINPLACE_CMD} -e 's,po,,' ${WRKSRC}/Makefile
137
137
post-install:
138
post-install:
138
	@${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \
139
	@${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \
139
		-exec ${STRIP_CMD} {} \;
140
		-exec ${STRIP_CMD} {} \;
(-)multimedia/audacious-plugins-gtk3/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1506369854
1
TIMESTAMP = 1537199323
2
SHA256 (audacious-media-player-audacious-plugins-3.9-gtk3-9c44e5e_GH0.tar.gz) = bfcae7c2312aeee360ac30be494ac0e97629af21b8823afa501abdbf19d5fcde
2
SHA256 (audacious-media-player-audacious-plugins-3.10-gtk3-9c44e5e_GH0.tar.gz) = bfcae7c2312aeee360ac30be494ac0e97629af21b8823afa501abdbf19d5fcde
3
SIZE (audacious-media-player-audacious-plugins-3.9-gtk3-9c44e5e_GH0.tar.gz) = 2749596
3
SIZE (audacious-media-player-audacious-plugins-3.10-gtk3-9c44e5e_GH0.tar.gz) = 2749596

Return to bug 231427