pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase Use PKGPATH instead of PKGNAME for chec...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/afafcad30716
branches:  trunk
changeset: 627925:afafcad30716
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Dec 21 08:59:41 2013 +0000

description:
Use PKGPATH instead of PKGNAME for check current package, because later variable
may not be defined yet and broken with old bmake in netbsd5.

diffstat:

 x11/qt5-qtbase/Makefile.common |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r cceb2906d6d2 -r afafcad30716 x11/qt5-qtbase/Makefile.common
--- a/x11/qt5-qtbase/Makefile.common    Sat Dec 21 02:47:39 2013 +0000
+++ b/x11/qt5-qtbase/Makefile.common    Sat Dec 21 08:59:41 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2013/12/20 02:36:10 obache Exp $
+# $NetBSD: Makefile.common,v 1.4 2013/12/21 08:59:41 obache Exp $
 # used by x11/qt5-dbus/Makefile
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
@@ -176,15 +176,15 @@
        ${LN} -sf ${QTPREFIX}/bin/rcc ${WRKSRC}/qtbase/bin/rcc
        ${LN} -sf ${QTPREFIX}/bin/uic ${WRKSRC}/qtbase/bin/uic
 
-.if empty(PKGNAME:Mqt5-qtbase*)
+.if empty(PKGPATH:Mx11/qt5-qtbase)
 pre-configure: remove-3rdparty-libs set-qmake-conf no-qmake-build
 .else
 pre-configure: remove-3rdparty-libs set-qmake-conf
 .endif
 
-.if empty(PKGNAME:Mqt5-qtbase*) && empty(PKGNAME:Mqt5-sqlite3*) \
-       && empty(PKGNAME:Mqt5-mysql*) && empty(PKGNAME:Mqt5-psql*) \
-       && empty(PKGNAME:Mqt5-odbc*)
+.if empty(PKGPATH:Mx11/qt5-qtbase) && empty(PKGPATH:Mx11/qt5-sqlite3) \
+       && empty(PKGPATH:Mx11/qt5-mysql) && empty(PKGPATH:Mx11/qt5-psql) \
+       && empty(PKGPATH:Mx11/Mqt5-odbc)
 post-configure:
        cd ${WRKSRC}/${BUILD_DIRS} && ${QTPREFIX}/bin/qmake -o Makefile
 .endif



Home | Main Index | Thread Index | Old Index