From 6291e82d638ade9e42d4168f953cbbeea27327ce Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Tue, 17 Apr 2007 14:18:12 +0000 Subject: [PATCH] Revert change from PR 111440 - juk in fact still does not support libtunepimp 0.5. Pointy hats to: lwhsu, for not testing properly lofi (myself), for also not testing properly Props to: Dima Panov for paying attention and noticing the error. --- audio/juk/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/audio/juk/Makefile b/audio/juk/Makefile index 26b21f16b261..64ce50cbf427 100644 --- a/audio/juk/Makefile +++ b/audio/juk/Makefile @@ -7,7 +7,7 @@ PORTNAME= juk PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -21,7 +21,7 @@ COMMENT= KDE audio player LIB_DEPENDS= akode:${PORTSDIR}/audio/akode \ musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ tag:${PORTSDIR}/audio/taglib \ - tunepimp:${PORTSDIR}/audio/libtunepimp + tunepimp-0.4.3:${PORTSDIR}/audio/libtunepimp-old CONFLICTS= kdemultimedia-3.3* @@ -36,6 +36,8 @@ USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION} USE_LDCONFIG= yes INSTALLS_ICONS= yes +CONFIGURE_ARGS+=CFLAGS=-I${LOCALBASE}/include/tunepimp-0.4 \ + LDFLAGS=-L${LOCALBASE}/lib/tunepimp-0.4 .include @@ -64,6 +66,9 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e 's|LIBS="-ltunepimp $$LIBS"|LIBS="-ltunepimp -liconv $$LIBS"|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-ltunepimp|-ltunepimp-0.4|g' \ + -e 's|||g' \ + ${WRKSRC}/configure ${WRKSRC}/juk/ktrm.cpp ${WRKSRC}/juk/Makefile.in do-build: cd ${WRKSRC}/arts/runtime && ${SETENV} ${MAKE_ENV} ${GMAKE}