Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/audio/amarok/Attic/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/audio/amarok/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.101 retrieving revision 1.122 diff -u -p -r1.101 -r1.122 --- pkgsrc/audio/amarok/Attic/Makefile 2011/11/01 06:00:33 1.101 +++ pkgsrc/audio/amarok/Attic/Makefile 2013/02/06 23:21:37 1.122 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.101 2011/11/01 06:00:33 sbd Exp $ +# $NetBSD: Makefile,v 1.122 2013/02/06 23:21:37 jperkin Exp $ # DISTNAME= amarok-${VERS} -VERS= 2.4.0 -PKGREVISION= 4 +VERS= 2.6.0 +PKGREVISION= 3 CATEGORIES= audio multimedia MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/ EXTRACT_SUFX= .tar.bz2 @@ -16,11 +16,8 @@ LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 DEPENDS+= moodbar-[0-9]*:../../audio/moodbar -PKG_DESTDIR_SUPPORT= user-destdir - -USE_CMAKE= yes USE_LANGUAGES= c c++ -USE_TOOLS+= msgfmt pkg-config +USE_TOOLS+= msgfmt pkg-config perl:run CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.mysql-client}/include/mysql CMAKE_ARGS+= -DMYSQL_EMBEDDED_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-server}/lib/mysql/libmysqld.a @@ -28,6 +25,8 @@ CMAKE_ARGS+= -DMYSQL_EMBEDDED_FOUND:BOOL CMAKE_ARGS+= -DHAVE_MYSQL_OPT_EMBEDDED_CONNECTION:BOOL=TRUE CMAKE_ARGS+= -DMYSQL_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-client}/lib/mysql/libmysqlclient.so +REPLACE_PERL+= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl + SUBST_CLASSES+= mysql SUBST_STAGE.mysql= post-patch SUBST_MESSAGE.mysql= Fixup paths for MySQL embedded @@ -55,6 +54,7 @@ SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILE BUILDLINK_API_DEPENDS.taglib+= taglib>=1.6nb1 .include "../../audio/taglib/buildlink3.mk" .include "../../audio/taglib-extras/buildlink3.mk" +.include "../../devel/qjson/buildlink3.mk" .include "../../devel/qtscriptgenerator/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../meta-pkgs/kde4/kde4.mk" @@ -63,7 +63,9 @@ BUILDLINK_API_DEPENDS.taglib+= taglib>=1 .include "../../security/qca2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" # for plasma -.include "../../x11/kdebase-workspace4/buildlink3.mk" +.include "../../x11/kde-workspace4/buildlink3.mk" BUILDLINK_API_DEPENDS.kdelibs+= kdelibs4>=4.5.0 .include "../../x11/kdelibs4/buildlink3.mk" +BUILDLINK_DEPMETHOD.qt4-tools= full +.include "../../x11/qt4-tools/buildlink3.mk" .include "../../mk/bsd.pkg.mk"