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

Collapse All | Expand All

(-)multimedia/audacious/Makefile (-8 / +11 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 22-34 Link Here
22
SUB_FILES=	pkg-message
21
SUB_FILES=	pkg-message
23
22
24
USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake \
23
USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake \
25
		localbase pkgconfig tar:bzip2
24
		gnome localbase pkgconfig tar:bzip2
26
GNU_CONFIGURE=	yes
27
USE_XORG=	x11 sm
25
USE_XORG=	x11 sm
28
USE_GNOME=	gtk20 glib20 cairo
26
USE_GNOME=	gtk20 glib20 cairo
29
USE_LDCONFIG=	yes
27
USE_LDCONFIG=	yes
30
INSTALLS_ICONS=	yes
28
INSTALLS_ICONS=	yes
31
29
30
GNU_CONFIGURE=	yes
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

Return to bug 231427