Attachment #76563 for bug #110341

View | Details | Raw Unified | Return to bug 110341
Collapse All | Expand All




#

PORTNAME=	yammi
PORTVERSION=	1.2.2
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2.r/.2-r/}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A QT-based music manager with fuzzy search

LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
		tag.5:${PORTSDIR}/audio/taglib

OPTIONS=	XMMS "XMMS backend support" off
		XMMS "XMMS backend support" off \
		NOATUN "Noatun backend support" on

WRKSRC=		${WRKDIR}/${PORTNAME}

USE_KDELIBS_VER=	3
USE_GMAKE=	yes
USE_AUTOTOOLS=	autoconf:259:env automake:19:env libtool:15:env
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-gstreamer
CONFIGURE_ARGS+=	--program-prefix='' --enable-threading=yes --enable-mt=yes
USE_KDELIBS_VER=3

.include <bsd.port.pre.mk>

.if defined(WITH_XMMS)
.if defined(WITHOUT_XMMS)
.if defined(WITHOUT_NOATUN)
IGNORE=	You must define at least one backend for yammi
.endif
.endif
.endif

.if !defined(WITHOUT_ARTS)
CONFIGURE_ARGS+=--with-arts
LIB_DEPENDS+=	artsgui:${PORTSDIR}/multimedia/kdemultimedia3
.else
CONFIGURE_ARGS+=--without-arts
.endif

.if !defined(WITHOUT_NOATUN)
RUN_DEPENDS+=	noatun:${PORTSDIR}/multimedia/kdemultimedia3
.endif

.if !defined(WITHOUT_XMMS)
CONFIGURE_ARGS+=--enable-xmms
BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms
LIB_DEPENDS+=   xmms.4:${PORTSDIR}/multimedia/xmms
.else
CONFIGURE_ARGS+=--disable-xmms
.endif

post-patch:
	@cd ${WRKSRC}/admin && ${REINPLACE_CMD} -e \
		's|="autoconf"|="${AUTOCONF:T}"|g ; \
		 s|="autoheader"|="${AUTOHEADER:T}"|g ; \
		 s|="autom4te"|="${AUTOM4TE:T}"|g ; \
		 s|="automake"|="${AUTOMAKE:T}"|g ; \
		 s|="aclocal"|="${ACLOCAL:T}"|g' detect-autoconf.sh

pre-configure:
	@cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} .
	@cd ${WRKSRC} && ${GMAKE} -f admin/Makefile.common

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)audio/yammi/distinfo (-3 / +3 lines)
1	MD5 (yammi-1.2-rc.tar.gz) = ab7bdd3fdf0ae671bac02b2f1c960fb7	1	MD5 (yammi-1.2.2.tar.gz) = 3da9fda532d2b5de2b3e20a55b81104b
2	SHA256 (yammi-1.2-rc.tar.gz) = fcbca477b9b7c6f4fd19a68edbdeaa6ed1d125ad56758b6770db078241cd0eff	2	SHA256 (yammi-1.2.2.tar.gz) = db91a6d5e8f8bffe4f2254964633eadd3b7793ca600fa14c33e20f1ed5d0ca5d
3	SIZE (yammi-1.2-rc.tar.gz) = 1170490	3	SIZE (yammi-1.2.2.tar.gz) = 1072843




--- configure.orig	Tue Dec 14 21:30:57 2004
+++ configure	Tue Dec 14 21:30:42 2004
@@ -25860,13 +25860,13 @@
 	;;
      esac
      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$PTHREAD_LIBS  $LIBS"
+LIBS="$PTHREAD_LIBS  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* #line $LINENO "configure" */
 /* confdefs.h.  */




--- src/icons/Makefile.in.orig	Tue Dec 14 22:54:21 2004
+++ src/icons/Makefile.in	Tue Dec 14 22:56:39 2004
@@ -465,9 +465,17 @@
 #>+ 1
 	$(INSTALL_DATA) $(srcdir)/toggle_playlist.png $(DESTDIR)$(kde_datadir)/yammi/icons/crystalsvg/22x22/actions/toggle_playlist.png
 
-#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/{16x16,22x22,32x32,48x48,64x64}/apps/
+#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/16x16/apps/
+#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/22x22/apps/
+#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/32x32/apps/
+#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/
+#>- 	$(mkinstalldirs) $(kde_icondir)/crystalsvg/64x64/apps/
 #>+ 1
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/{16x16,22x22,32x32,48x48,64x64}/apps/
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/
 
 #>- 	$(INSTALL_DATA) $(srcdir)/yammi16x16.png $(kde_icondir)/crystalsvg/16x16/apps/yammi.png
 #>+ 1

Lines 1-29 Link Here

(-)audio/yammi/pkg-plist (-13 / +15 lines)
1	bin/yammi	1	bin/yammi
2	bin/yammiGrabAndEncode	2	bin/yammiGrabAndEncode
3	share/doc/HTML/en/yammi/common	3	share/applnk/Multimedia/yammi.desktop
4	share/doc/HTML/en/yammi/screenshot.png
5	share/doc/HTML/en/yammi/index.docbook
6	share/doc/HTML/en/yammi/index.cache
7	share/doc/HTML/en/yammi/index.cache.bz2
8	share/locale/de/LC_MESSAGES/yammi.mo
9	share/locale/es/LC_MESSAGES/yammi.mo
10	share/locale/it/LC_MESSAGES/yammi.mo
11	share/apps/yammi/icons/crystalsvg/22x22/actions/enqueue_asnext.png
12	share/apps/yammi/icons/crystalsvg/22x22/actions/enqueue.png	4	share/apps/yammi/icons/crystalsvg/22x22/actions/enqueue.png
		5	share/apps/yammi/icons/crystalsvg/22x22/actions/enqueue_asnext.png
13	share/apps/yammi/icons/crystalsvg/22x22/actions/play_now.png	6	share/apps/yammi/icons/crystalsvg/22x22/actions/play_now.png
14	share/apps/yammi/icons/crystalsvg/22x22/actions/stop_prelisten.png
15	share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_start.png
16	share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_middle.png
17	share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_end.png	7	share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_end.png
		8	share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_middle.png
		9	share/apps/yammi/icons/crystalsvg/22x22/actions/prelisten_start.png
		10	share/apps/yammi/icons/crystalsvg/22x22/actions/stop_prelisten.png
18	share/apps/yammi/icons/crystalsvg/22x22/actions/toggle_playlist.png	11	share/apps/yammi/icons/crystalsvg/22x22/actions/toggle_playlist.png
		12	share/apps/yammi/pics/nowplaying.png
		13	share/apps/yammi/pics/playlistbackground.jpg
19	share/apps/yammi/yammiui.rc	14	share/apps/yammi/yammiui.rc
		15	share/doc/HTML/en/yammi/common
		16	share/doc/HTML/en/yammi/index.cache.bz2
		17	share/doc/HTML/en/yammi/index.docbook
		18	share/doc/HTML/en/yammi/screenshot.png
20	share/icons/crystalsvg/16x16/apps/yammi.png	19	share/icons/crystalsvg/16x16/apps/yammi.png
21	share/icons/crystalsvg/22x22/apps/yammi.png	20	share/icons/crystalsvg/22x22/apps/yammi.png
22	share/icons/crystalsvg/32x32/apps/yammi.png	21	share/icons/crystalsvg/32x32/apps/yammi.png
23	share/icons/crystalsvg/48x48/apps/yammi.png	22	share/icons/crystalsvg/48x48/apps/yammi.png
24	share/icons/crystalsvg/64x64/apps/yammi.png	23	share/icons/crystalsvg/64x64/apps/yammi.png
25	share/applnk/Multimedia/yammi.desktop	24	share/locale/de/LC_MESSAGES/yammi.mo
		25	share/locale/es/LC_MESSAGES/yammi.mo
		26	share/locale/it/LC_MESSAGES/yammi.mo
26	@dirrm share/doc/HTML/en/yammi	27	@dirrm share/doc/HTML/en/yammi
		28	@dirrm share/apps/yammi/pics
27	@dirrm share/apps/yammi/icons/crystalsvg/22x22/actions	29	@dirrm share/apps/yammi/icons/crystalsvg/22x22/actions
28	@dirrm share/apps/yammi/icons/crystalsvg/22x22	30	@dirrm share/apps/yammi/icons/crystalsvg/22x22
29	@dirrm share/apps/yammi/icons/crystalsvg	31	@dirrm share/apps/yammi/icons/crystalsvg

Return to bug 110341

Lines 6-63 Link Here

(-)audio/yammi/Makefile (-33 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= yammi	8	PORTNAME= yammi
9	PORTVERSION= 1.2.rc	9	PORTVERSION= 1.2.2
10	PORTREVISION= 1
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.2.r/.2-r/}
15		13
16	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
17	COMMENT= A QT-based music manager with fuzzy search	15	COMMENT= A QT-based music manager with fuzzy search
18		16
19	LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \	17	LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
20	id3-3.8.3:${PORTSDIR}/audio/id3lib	18	tag.5:${PORTSDIR}/audio/taglib
21		19
22	OPTIONS= ARTS "Arts backend support" on \	20	OPTIONS= XMMS "XMMS backend support" off
23	XMMS "XMMS backend support" off \
24	NOATUN "Noatun backend support" on
25		21
26	USE_QT_VER= 3	22	WRKSRC= ${WRKDIR}/${PORTNAME}
		23
		24	USE_KDELIBS_VER= 3
27	USE_GMAKE= yes	25	USE_GMAKE= yes
28	USE_AUTOTOOLS= libtool:15	26	USE_AUTOTOOLS= autoconf:259:env automake:19:env libtool:15:env
29	CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \	27	GNU_CONFIGURE= yes
30	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"	28	CONFIGURE_ARGS= --disable-gstreamer
31	CONFIGURE_ARGS+= --program-prefix='' --enable-threading=yes --enable-mt=yes
32	USE_KDELIBS_VER=3
33		29
34	.include <bsd.port.pre.mk>	30	.include <bsd.port.pre.mk>
35		31
36	.if defined(WITHOUT_ARTS)	32	.if defined(WITH_XMMS)
37	.if defined(WITHOUT_XMMS)
38	.if defined(WITHOUT_NOATUN)
39	IGNORE= You must define at least one backend for yammi
40	.endif
41	.endif
42	.endif
43
44	.if !defined(WITHOUT_ARTS)
45	CONFIGURE_ARGS+=--with-arts
46	LIB_DEPENDS+= artsgui:${PORTSDIR}/multimedia/kdemultimedia3
47	.else
48	CONFIGURE_ARGS+=--without-arts
49	.endif
50
51	.if !defined(WITHOUT_NOATUN)
52	RUN_DEPENDS+= noatun:${PORTSDIR}/multimedia/kdemultimedia3
53	.endif
54
55	.if !defined(WITHOUT_XMMS)
56	CONFIGURE_ARGS+=--enable-xmms	33	CONFIGURE_ARGS+=--enable-xmms
57	BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms	34	BUILD_DEPENDS+= xmms-config:${PORTSDIR}/multimedia/xmms
58	LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms	35	LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
59	.else	36	.else
60	CONFIGURE_ARGS+=--disable-xmms	37	CONFIGURE_ARGS+=--disable-xmms
61	.endif	38	.endif
		39
		40	post-patch:
		41	@cd ${WRKSRC}/admin && ${REINPLACE_CMD} -e \
		42	's\|="autoconf"\|="${AUTOCONF:T}"\|g ; \
		43	s\|="autoheader"\|="${AUTOHEADER:T}"\|g ; \
		44	s\|="autom4te"\|="${AUTOM4TE:T}"\|g ; \
		45	s\|="automake"\|="${AUTOMAKE:T}"\|g ; \
		46	s\|="aclocal"\|="${ACLOCAL:T}"\|g' detect-autoconf.sh
		47
		48	pre-configure:
		49	@cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} .
		50	@cd ${WRKSRC} && ${GMAKE} -f admin/Makefile.common
62		51
63	.include <bsd.port.post.mk>	52	.include <bsd.port.post.mk>

Lines 1-19 Link Here

(-)audio/yammi/files/patch-configure (-19 lines)
1	--- configure.orig Tue Dec 14 21:30:57 2004
2	+++ configure Tue Dec 14 21:30:42 2004
3	@@ -25860,13 +25860,13 @@
4	;;
5	esac
6	as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" \| $as_tr_sh`
7	-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
8	-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
9	+echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
10	+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
11	if eval "test \"\${$as_ac_Lib+set}\" = set"; then
12	echo $ECHO_N "(cached) $ECHO_C" >&6
13	else
14	ac_check_lib_save_LIBS=$LIBS
15	-LIBS="-l$PTHREAD_LIBS $LIBS"
16	+LIBS="$PTHREAD_LIBS $LIBS"
17	cat >conftest.$ac_ext <<_ACEOF
18	/* #line $LINENO "configure" */
19	/* confdefs.h. */

Lines 1-22 Link Here

(-)audio/yammi/files/patch-src::icons::Makefile.in (-22 lines)
1	--- src/icons/Makefile.in.orig Tue Dec 14 22:54:21 2004
2	+++ src/icons/Makefile.in Tue Dec 14 22:56:39 2004
3	@@ -465,9 +465,17 @@
4	#>+ 1
5	$(INSTALL_DATA) $(srcdir)/toggle_playlist.png $(DESTDIR)$(kde_datadir)/yammi/icons/crystalsvg/22x22/actions/toggle_playlist.png
6
7	-#>- $(mkinstalldirs) $(kde_icondir)/crystalsvg/{16x16,22x22,32x32,48x48,64x64}/apps/
8	+#>- $(mkinstalldirs) $(kde_icondir)/crystalsvg/16x16/apps/
9	+#>- $(mkinstalldirs) $(kde_icondir)/crystalsvg/22x22/apps/
10	+#>- $(mkinstalldirs) $(kde_icondir)/crystalsvg/32x32/apps/
11	+#>- $(mkinstalldirs) $(kde_icondir)/crystalsvg/48x48/apps/
12	+#>- $(mkinstalldirs) $(kde_icondir)/crystalsvg/64x64/apps/
13	#>+ 1
14	- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/{16x16,22x22,32x32,48x48,64x64}/apps/
15	+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/
16	+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/
17	+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/
18	+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/
19	+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/
20
21	#>- $(INSTALL_DATA) $(srcdir)/yammi16x16.png $(kde_icondir)/crystalsvg/16x16/apps/yammi.png
22	#>+ 1