Thu Jan 15 13:00:32 2015 UTC ()
Don't depend on wrappers adding /usr/pkg/lib implicitly to the search
path.


(joerg)
diff -r1.5 -r1.6 pkgsrc/chat/swift/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/chat/swift/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/swift/Makefile 2014/11/07 19:39:27 1.5
+++ pkgsrc/chat/swift/Makefile 2015/01/15 13:00:32 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2014/11/07 19:39:27 adam Exp $ 1# $NetBSD: Makefile,v 1.6 2015/01/15 13:00:32 joerg Exp $
2 2
3DISTNAME= swift-2.0 3DISTNAME= swift-2.0
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= http://swift.im/downloads/releases/swift-2.0/ 6MASTER_SITES= http://swift.im/downloads/releases/swift-2.0/
7 7
8MAINTAINER= eric@cirr.com 8MAINTAINER= eric@cirr.com
9HOMEPAGE= http://swift.im/ 9HOMEPAGE= http://swift.im/
10COMMENT= Swift XMPP Client 10COMMENT= Swift XMPP Client
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13DEPENDS+= scons>=1.3:../../devel/scons 13DEPENDS+= scons>=1.3:../../devel/scons
14 14
@@ -16,27 +16,27 @@ USE_LANGUAGES= c c++ @@ -16,27 +16,27 @@ USE_LANGUAGES= c c++
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17 17
18INSTALLATION_DIRS= ${PKGMANDIR}/man1 18INSTALLATION_DIRS= ${PKGMANDIR}/man1
19 19
20SUBST_CLASSES+= path 20SUBST_CLASSES+= path
21SUBST_STAGE.path= pre-configure 21SUBST_STAGE.path= pre-configure
22SUBST_SED.path+= -e "s,/usr/local/share/,${PREFIX}/share/," 22SUBST_SED.path+= -e "s,/usr/local/share/,${PREFIX}/share/,"
23SUBST_FILES.path+= SwifTools/Application/UnixApplicationPathProvider.cpp 23SUBST_FILES.path+= SwifTools/Application/UnixApplicationPathProvider.cpp
24SUBST_MESSAGE.path= Fixing path to support files. 24SUBST_MESSAGE.path= Fixing path to support files.
25 25
26do-configure: 26do-configure:
27 cd ${WRKSRC} ; \ 27 cd ${WRKSRC} ; \
28 ${ECHO} "qt=\"${QTDIR}\"" > config.py ;\ 28 ${ECHO} "qt=\"${QTDIR}\"" > config.py ;\
29 ${ECHO} "linkflags=\"-Wl,-R${QTDIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${BUILDLINK_DIR}/lib\"" >> config.py ; \ 29 ${ECHO} "linkflags=\"-L${PREFIX}/lib -Wl,-R${QTDIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${BUILDLINK_DIR}/lib\"" >> config.py ; \
30 ${ECHO} "allow_warnings=\"true\"" >> config.py ; 30 ${ECHO} "allow_warnings=\"true\"" >> config.py ;
31 31
32do-build: 32do-build:
33 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons Swift 33 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons Swift
34 34
35do-install: 35do-install:
36 cd ${WRKSRC} && \ 36 cd ${WRKSRC} && \
37 ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \ 37 ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \
38 SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX} 38 SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX}
39 ${INSTALL_DATA} ${WRKSRC}/Swift/Packaging/Debian/debian/swift-im.1 \ 39 ${INSTALL_DATA} ${WRKSRC}/Swift/Packaging/Debian/debian/swift-im.1 \
40 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 40 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
41 41
42.include "../../lang/python/application.mk" 42.include "../../lang/python/application.mk"