Thu May 1 12:51:06 2014 UTC ()
Remove hack that only worked when building as root.


(wiz)
diff -r1.49 -r1.50 pkgsrc/audio/kid3/Makefile
cvs diff -r1.49 -r1.50 pkgsrc/audio/kid3/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/kid3/Makefile 2014/04/30 12:43:46 1.49
+++ pkgsrc/audio/kid3/Makefile 2014/05/01 12:51:06 1.50
@@ -1,47 +1,39 @@ @@ -1,47 +1,39 @@
1# $NetBSD: Makefile,v 1.49 2014/04/30 12:43:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.50 2014/05/01 12:51:06 wiz Exp $
2 2
3DISTNAME= kid3-3.1 3DISTNAME= kid3-3.1
4CATEGORIES= kde audio 4CATEGORIES= kde audio
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kid3/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kid3/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://kid3.sourceforge.net/ 8HOMEPAGE= http://kid3.sourceforge.net/
9COMMENT= ID3 tagger for QT 9COMMENT= ID3 tagger for QT
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 12BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
13BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 13BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
14 14
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= perl:build pkg-config 17USE_TOOLS+= perl:build pkg-config
18CMAKE_ARGS+= -DQt5Core_DIR:PATH=${QTDIR} 18CMAKE_ARGS+= -DQt5Core_DIR:PATH=${QTDIR}
19CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:PATH=${QTDIR}/bin/qmake 19CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:PATH=${QTDIR}/bin/qmake
20CMAKE_ARGS+= -DWITH_DOCBOOKDIR:PATH=${PREFIX}/share/xsl/docbook 20CMAKE_ARGS+= -DWITH_DOCBOOKDIR:PATH=${PREFIX}/share/xsl/docbook
21CMAKE_ARGS+= -DWITH_APPS:STRING="Qt;CLI" 21CMAKE_ARGS+= -DWITH_APPS:STRING="Qt;CLI"
22CMAKE_ARGS+= -DWITH_MANDIR:STRING=${PKGMANDIR} 22CMAKE_ARGS+= -DWITH_MANDIR:STRING=${PKGMANDIR}
23# seems to be ignored, so put it into LDFLAGS 23# seems to be ignored, so put it into LDFLAGS
24CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH:PATH=${PREFIX}/lib/kid3 24CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH:PATH=${PREFIX}/lib/kid3
25LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/kid3 25LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/kid3
26 26
27# workaround: qt5-dbus does not install these tools, but 
28# CMake expects them to be there, since they are referenced from 
29# qt5-installed .cmake files 
30pre-configure: 
31 cd ${PREFIX}/qt5/bin && \ 
32 if [ ! -f qdbuscpp2xml ]; then touch qdbuscpp2xml; fi; \ 
33 if [ ! -f qdbusxml2cpp ]; then touch qdbusxml2cpp; fi; 
34 
35.include "../../audio/chromaprint/buildlink3.mk" 27.include "../../audio/chromaprint/buildlink3.mk"
36.include "../../audio/flac/buildlink3.mk" 28.include "../../audio/flac/buildlink3.mk"
37.include "../../audio/id3lib/buildlink3.mk" 29.include "../../audio/id3lib/buildlink3.mk"
38.include "../../audio/taglib/buildlink3.mk" 30.include "../../audio/taglib/buildlink3.mk"
39.include "../../devel/readline/buildlink3.mk" 31.include "../../devel/readline/buildlink3.mk"
40.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 32.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
41.include "../../sysutils/desktop-file-utils/desktopdb.mk" 33.include "../../sysutils/desktop-file-utils/desktopdb.mk"
42.include "../../x11/qt5-dbus/buildlink3.mk" 34.include "../../x11/qt5-dbus/buildlink3.mk"
43.include "../../x11/qt5-qtbase/buildlink3.mk" 35.include "../../x11/qt5-qtbase/buildlink3.mk"
44.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 36.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
45.include "../../x11/qt5-qttools/buildlink3.mk" 37.include "../../x11/qt5-qttools/buildlink3.mk"
46.include "../../mk/pthread.buildlink3.mk" 38.include "../../mk/pthread.buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"