pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc ipe, qgpgme, retroarch: Do not define MOC in each pack...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d1443cee6bb
branches:  trunk
changeset: 445968:8d1443cee6bb
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Feb 02 12:05:48 2021 +0000

description:
ipe, qgpgme, retroarch: Do not define MOC in each packages

They are defined in x11/qt5-qtbase/buildlink3.mk now.

diffstat:

 emulators/retroarch/options.mk |  3 +--
 graphics/ipe/Makefile          |  3 +--
 security/qgpgme/Makefile       |  4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r b8783ced4a82 -r 8d1443cee6bb emulators/retroarch/options.mk
--- a/emulators/retroarch/options.mk    Tue Feb 02 12:00:13 2021 +0000
+++ b/emulators/retroarch/options.mk    Tue Feb 02 12:05:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2020/06/25 12:25:19 nia Exp $
+# $NetBSD: options.mk,v 1.17 2021/02/02 12:05:48 ryoon Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.retroarch
 
@@ -108,7 +108,6 @@
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 # error: "You must build your code with position independent code if Qt was built with -reduce-relocations."
 CFLAGS+=               -fPIC
-CONFIGURE_ENV+=                MOC=${QTDIR}/bin/moc
 CONFIGURE_ARGS+=       --enable-qt
 .else
 CONFIGURE_ARGS+=       --disable-qt
diff -r b8783ced4a82 -r 8d1443cee6bb graphics/ipe/Makefile
--- a/graphics/ipe/Makefile     Tue Feb 02 12:00:13 2021 +0000
+++ b/graphics/ipe/Makefile     Tue Feb 02 12:05:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/01/01 09:52:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2021/02/02 12:05:48 ryoon Exp $
 
 DISTNAME=      ipe-7.2.7-src
 PKGNAME=       ${DISTNAME:S/-src//}
@@ -18,7 +18,6 @@
 MAKE_ENV+=     IPEPREFIX=${DESTDIR}${PREFIX}
 MAKE_ENV+=     LUA_PACKAGE=lua-5.3
 MAKE_ENV+=     DL_LIBS=${DL_LIBS}
-MAKE_ENV+=     MOC=${QTDIR}/bin/moc
 MAKE_ENV+=     IPEMANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 CHECK_INTERPRETER_SKIP=        share/ipe/${PKGVERSION_NOREV}/scripts/*.lua
diff -r b8783ced4a82 -r 8d1443cee6bb security/qgpgme/Makefile
--- a/security/qgpgme/Makefile  Tue Feb 02 12:00:13 2021 +0000
+++ b/security/qgpgme/Makefile  Tue Feb 02 12:05:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/11/05 09:07:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2021/02/02 12:05:48 ryoon Exp $
 
 DISTNAME=      gpgme-1.10.0
 PKGNAME=       qgpgme-1.10.0
@@ -18,8 +18,6 @@
 
 BUILD_DIRS=    lang/qt/src
 
-CONFIGURE_ENV+=        MOC=${QTDIR}/bin/moc
-
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index