CVS commit: pkgsrc

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Feb  2 12:05:48 UTC 2021

Modified Files:
        pkgsrc/emulators/retroarch: options.mk
        pkgsrc/graphics/ipe: Makefile
        pkgsrc/security/qgpgme: Makefile

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/retroarch/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/ipe/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/qgpgme/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/retroarch/options.mk
diff -u pkgsrc/emulators/retroarch/options.mk:1.16 pkgsrc/emulators/retroarch/options.mk:1.17
--- pkgsrc/emulators/retroarch/options.mk:1.16  Thu Jun 25 12:25:19 2020
+++ pkgsrc/emulators/retroarch/options.mk       Tue Feb  2 12:05:48 2021
@@ -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 @@ CONFIGURE_ARGS+=    --disable-pulse
 .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

Index: pkgsrc/graphics/ipe/Makefile
diff -u pkgsrc/graphics/ipe/Makefile:1.13 pkgsrc/graphics/ipe/Makefile:1.14
--- pkgsrc/graphics/ipe/Makefile:1.13   Fri Jan  1 09:52:30 2021
+++ pkgsrc/graphics/ipe/Makefile        Tue Feb  2 12:05:48 2021
@@ -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+=    QT_SELECT=5
 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

Index: pkgsrc/security/qgpgme/Makefile
diff -u pkgsrc/security/qgpgme/Makefile:1.15 pkgsrc/security/qgpgme/Makefile:1.16
--- pkgsrc/security/qgpgme/Makefile:1.15        Thu Nov  5 09:07:07 2020
+++ pkgsrc/security/qgpgme/Makefile     Tue Feb  2 12:05:48 2021
@@ -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 @@ USE_LANGUAGES=        c c++
 
 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"