Wed Aug 11 13:29:19 2010 UTC ()
sync with base pkg
qt4: run "moc" at build time to make sure the generated files
match the installed qt version


(drochner)
diff -r1.2 -r1.3 pkgsrc/security/pinentry-gtk/Makefile
diff -r1.4 -r1.5 pkgsrc/security/pinentry-gtk2/Makefile
diff -r1.3 -r1.4 pkgsrc/security/pinentry-qt/Makefile
diff -r1.2 -r1.3 pkgsrc/security/pinentry-qt4/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/security/pinentry-gtk/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-gtk/Attic/Makefile 2010/02/22 17:20:39 1.2
+++ pkgsrc/security/pinentry-gtk/Attic/Makefile 2010/08/11 13:29:19 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.2 2010/02/22 17:20:39 drochner Exp $ 1# $NetBSD: Makefile,v 1.3 2010/08/11 13:29:19 drochner Exp $
2# 2#
3 3
4DISTNAME= pinentry-0.7.6 4DISTNAME= pinentry-0.8.0
5PKGNAME= pinentry-gtk-0.7.6 5PKGNAME= pinentry-gtk-0.8.0
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/ 7MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
8 8
9MAINTAINER= shannonjr@NetBSD.org 9MAINTAINER= shannonjr@NetBSD.org
10HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/ 10HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
11COMMENT= Applications for entering PINs or Passphrases 11COMMENT= Applications for entering PINs or Passphrases
12 12
13PATCHDIR= ${.CURDIR}/../../security/pinentry/patches 13PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
14DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} 18CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
cvs diff -r1.4 -r1.5 pkgsrc/security/pinentry-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-gtk2/Makefile 2010/06/13 22:45:19 1.4
+++ pkgsrc/security/pinentry-gtk2/Makefile 2010/08/11 13:29:19 1.5
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2010/08/11 13:29:19 drochner Exp $
2# 2#
3 3
4DISTNAME= pinentry-0.7.6 4DISTNAME= pinentry-0.8.0
5PKGNAME= pinentry-gtk2-0.7.6 5PKGNAME= pinentry-gtk2-0.8.0
6PKGREVISION= 1 
7CATEGORIES= security 6CATEGORIES= security
8MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/ 7MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
9 8
10MAINTAINER= shannonjr@NetBSD.org 9MAINTAINER= shannonjr@NetBSD.org
11HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/ 10HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
12COMMENT= Applications for entering PINs or Passphrases 11COMMENT= Applications for entering PINs or Passphrases
13 12
14PATCHDIR= ${.CURDIR}/../../security/pinentry/patches 13PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
15DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
18USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
19GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
cvs diff -r1.3 -r1.4 pkgsrc/security/pinentry-qt/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-qt/Attic/Makefile 2010/06/13 22:45:19 1.3
+++ pkgsrc/security/pinentry-qt/Attic/Makefile 2010/08/11 13:29:19 1.4
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2010/08/11 13:29:19 drochner Exp $
2# 2#
3 3
4DISTNAME= pinentry-0.7.6 4DISTNAME= pinentry-0.8.0
5PKGNAME= pinentry-qt-0.7.6 5PKGNAME= pinentry-qt-0.8.0
6PKGREVISION= 1 
7CATEGORIES= security 6CATEGORIES= security
8MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/ 7MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
9 8
10MAINTAINER= shannonjr@NetBSD.org 9MAINTAINER= shannonjr@NetBSD.org
11HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/ 10HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
12COMMENT= Applications for entering PINs or Passphrases 11COMMENT= Applications for entering PINs or Passphrases
13 12
14PATCHDIR= ${.CURDIR}/../../security/pinentry/patches 13PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
15DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} 18CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
cvs diff -r1.2 -r1.3 pkgsrc/security/pinentry-qt4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry-qt4/Attic/Makefile 2010/06/13 22:45:19 1.2
+++ pkgsrc/security/pinentry-qt4/Attic/Makefile 2010/08/11 13:29:19 1.3
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2010/08/11 13:29:19 drochner Exp $
2# 2#
3 3
4DISTNAME= pinentry-0.7.6 4DISTNAME= pinentry-0.8.0
5PKGNAME= pinentry-qt4-0.7.6 5PKGNAME= pinentry-qt4-0.8.0
6PKGREVISION= 1 
7CATEGORIES= security 6CATEGORIES= security
8MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/ 7MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
9 8
10MAINTAINER= shannonjr@NetBSD.org 9MAINTAINER= shannonjr@NetBSD.org
11HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/ 10HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
12COMMENT= Applications for entering PINs or Passphrases 11COMMENT= Applications for entering PINs or Passphrases
13 12
14PATCHDIR= ${.CURDIR}/../../security/pinentry/patches 13PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
15DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} 18CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
@@ -23,20 +22,25 @@ CONFIGURE_ARGS+= --with-qt-includes=${BU @@ -23,20 +22,25 @@ CONFIGURE_ARGS+= --with-qt-includes=${BU
23CONFIGURE_ARGS+= --with-qt-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib 22CONFIGURE_ARGS+= --with-qt-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib
24CONFIGURE_ARGS+= --disable-pinentry-curses 23CONFIGURE_ARGS+= --disable-pinentry-curses
25#CONFIGURE_ARGS+= --disable-fallback-curses 24#CONFIGURE_ARGS+= --disable-fallback-curses
26CONFIGURE_ARGS+= --disable-pinentry-gtk 25CONFIGURE_ARGS+= --disable-pinentry-gtk
27CONFIGURE_ARGS+= --disable-pinentry-gtk2 26CONFIGURE_ARGS+= --disable-pinentry-gtk2
28CONFIGURE_ARGS+= --disable-pinentry-qt 27CONFIGURE_ARGS+= --disable-pinentry-qt
29 28
30USE_LANGUAGES+= c c++ 29USE_LANGUAGES+= c c++
31USE_TOOLS+= pkg-config gmake 30USE_TOOLS+= pkg-config gmake
32INFO_FILES= yes 31INFO_FILES= yes
33 32
34INSTALL_DIRS= qt4 33INSTALL_DIRS= qt4
35 34
 35post-configure:
 36 cd $(WRKSRC)/qt4 && \
 37 $(QTDIR)/bin/moc pinentrydialog.h -o pinentrydialog.moc && \
 38 $(QTDIR)/bin/moc qsecurelineedit.h -o qsecurelineedit.moc
 39
36BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0 40BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
37.include "../../x11/qt4-libs/buildlink3.mk" 41.include "../../x11/qt4-libs/buildlink3.mk"
38.include "../../converters/libiconv/buildlink3.mk" 42.include "../../converters/libiconv/buildlink3.mk"
39#.include "../../security/libgpg-error/buildlink3.mk" 43#.include "../../security/libgpg-error/buildlink3.mk"
40#.include "../../security/libksba/buildlink3.mk" 44#.include "../../security/libksba/buildlink3.mk"
41.include "../../mk/pthread.buildlink3.mk" 45.include "../../mk/pthread.buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"