pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security Convert security/pinentry* to using Makefile....
details: https://anonhg.NetBSD.org/pkgsrc/rev/ede92139f8e0
branches: trunk
changeset: 643026:ede92139f8e0
user: mef <mef%pkgsrc.org@localhost>
date: Wed Dec 10 02:27:43 2014 +0000
description:
Convert security/pinentry* to using Makefile.common style.
No any changes on built binary. Proposed at:
http://mail-index.netbsd.org/pkgsrc-users/2014/12/08/msg020735.html
Thank you.
diffstat:
security/pinentry-gtk/Makefile | 24 +++++-------------------
security/pinentry-gtk2/Makefile | 24 +++++-------------------
security/pinentry-qt/Makefile | 22 ++++------------------
security/pinentry-qt4/Makefile | 23 +++++------------------
security/pinentry/Makefile | 31 +++++--------------------------
security/pinentry/Makefile.common | 30 ++++++++++++++++++++++++++++++
6 files changed, 54 insertions(+), 100 deletions(-)
diffs (272 lines):
diff -r ed2b10c46160 -r ede92139f8e0 security/pinentry-gtk/Makefile
--- a/security/pinentry-gtk/Makefile Wed Dec 10 01:54:33 2014 +0000
+++ b/security/pinentry-gtk/Makefile Wed Dec 10 02:27:43 2014 +0000
@@ -1,22 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2014/01/01 11:52:33 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2014/12/10 02:27:43 mef Exp $
#
-DISTNAME= pinentry-0.8.3
-PKGNAME= pinentry-gtk-0.8.3
+PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk-/}
PKGREVISION= 1
-CATEGORIES= security
-MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
-EXTRACT_SUFX= .tar.bz2
+COMMENT= Applications for entering PINs or Passphrases, gtk enabled
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
-COMMENT= Applications for entering PINs or Passphrases
+.include "../../security/pinentry/Makefile.common"
-PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
-DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --enable-pinentry-gtk
CONFIGURE_ARGS+= --disable-pinentry-curses
#CONFIGURE_ARGS+= --disable-fallback-curses
@@ -24,15 +14,11 @@
CONFIGURE_ARGS+= --disable-pinentry-qt
CONFIGURE_ARGS+= --disable-pinentry-qt4
-INFO_FILES= yes
-
INSTALL_DIRS= gtk
BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
.include "../../x11/gtk/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
#.include "../../security/libgpg-error/buildlink3.mk"
#.include "../../security/libksba/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff -r ed2b10c46160 -r ede92139f8e0 security/pinentry-gtk2/Makefile
--- a/security/pinentry-gtk2/Makefile Wed Dec 10 01:54:33 2014 +0000
+++ b/security/pinentry-gtk2/Makefile Wed Dec 10 02:27:43 2014 +0000
@@ -1,23 +1,13 @@
-# $NetBSD: Makefile,v 1.30 2014/05/05 00:48:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2014/12/10 02:27:44 mef Exp $
#
-DISTNAME= pinentry-0.8.3
-PKGNAME= pinentry-gtk2-0.8.3
+PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk2-/}
PKGREVISION= 4
-CATEGORIES= security
-MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
-EXTRACT_SUFX= .tar.bz2
+COMMENT= Applications for entering PINs or Passphrases, gtk2 enabled
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
-COMMENT= Applications for entering PINs or Passphrases
-
-PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
-DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
+.include "../../security/pinentry/Makefile.common"
USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --enable-pinentry-gtk2
CONFIGURE_ARGS+= --disable-pinentry-curses
#CONFIGURE_ARGS+= --disable-fallback-curses
@@ -25,15 +15,11 @@
CONFIGURE_ARGS+= --disable-pinentry-qt
CONFIGURE_ARGS+= --disable-pinentry-qt4
-INFO_FILES= yes
-
INSTALL_DIRS= gtk+-2
BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
#.include "../../security/libgpg-error/buildlink3.mk"
#.include "../../security/libksba/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff -r ed2b10c46160 -r ede92139f8e0 security/pinentry-qt/Makefile
--- a/security/pinentry-qt/Makefile Wed Dec 10 01:54:33 2014 +0000
+++ b/security/pinentry-qt/Makefile Wed Dec 10 02:27:43 2014 +0000
@@ -1,22 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2014/01/01 11:52:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2014/12/10 02:27:44 mef Exp $
#
-DISTNAME= pinentry-0.8.3
-PKGNAME= pinentry-qt-0.8.3
+PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt-/}
PKGREVISION= 2
-CATEGORIES= security
-MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
-EXTRACT_SUFX= .tar.bz2
+COMMENT= Applications for entering PINs or Passphrases, qt3 enabled
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
-COMMENT= Applications for entering PINs or Passphrases
+.include "../../security/pinentry/Makefile.common"
-PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
-DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --enable-pinentry-qt
CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q}
CONFIGURE_ARGS+= --with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include
@@ -29,15 +19,11 @@
USE_LANGUAGES+= c c++
USE_TOOLS+= gmake
-INFO_FILES= yes
INSTALL_DIRS= qt
BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
#.include "../../security/libgpg-error/buildlink3.mk"
#.include "../../security/libksba/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ed2b10c46160 -r ede92139f8e0 security/pinentry-qt4/Makefile
--- a/security/pinentry-qt4/Makefile Wed Dec 10 01:54:33 2014 +0000
+++ b/security/pinentry-qt4/Makefile Wed Dec 10 02:27:43 2014 +0000
@@ -1,22 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2014/02/12 23:18:35 tron Exp $
+# $NetBSD: Makefile,v 1.30 2014/12/10 02:27:44 mef Exp $
#
-DISTNAME= pinentry-0.8.3
-PKGNAME= pinentry-qt4-0.8.3
+PKGNAME= ${DISTNAME:S/pinentry-/pinentry-qt4-/}
PKGREVISION= 2
-CATEGORIES= security
-MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
-EXTRACT_SUFX= .tar.bz2
+COMMENT= Applications for entering PINs or Passphrases, qt4 enabled
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
-COMMENT= Applications for entering PINs or Passphrases
+.include "../../security/pinentry/Makefile.common"
-PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
-DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --enable-pinentry-qt4
CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q}
CONFIGURE_ARGS+= --with-qt-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include
@@ -29,7 +19,6 @@
USE_LANGUAGES+= c c++
USE_TOOLS+= pkg-config gmake
-INFO_FILES= yes
INSTALL_DIRS= qt4
@@ -40,9 +29,7 @@
BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
#.include "../../security/libgpg-error/buildlink3.mk"
#.include "../../security/libksba/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff -r ed2b10c46160 -r ede92139f8e0 security/pinentry/Makefile
--- a/security/pinentry/Makefile Wed Dec 10 01:54:33 2014 +0000
+++ b/security/pinentry/Makefile Wed Dec 10 02:27:43 2014 +0000
@@ -1,28 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2014/01/01 11:52:33 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2014/12/10 02:27:43 mef Exp $
#
-# The following packages use the same distfile, even if they
-# currently do not use a common Makefile fragment. Please look at
-# them when updating this package
-# pkgsrc/security/pinentry-gtk
-# pkgsrc/security/pinentry-gtk2
-# pkgsrc/security/pinentry-qt
-# pkgsrc/security/pinentry-qt4
-
-DISTNAME= pinentry-0.8.3
+#PKGNAME= ${DISTNAME}
PKGREVISION= 2
-CATEGORIES= security
-MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
-EXTRACT_SUFX= .tar.bz2
+COMMENT= Applications for entering PINs or Passphrases
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
-COMMENT= Applications for entering PINs or Passphrases
-LICENSE= gnu-gpl-v2
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-
-INFO_FILES= yes
+.include "../../security/pinentry/Makefile.common"
.include "options.mk"
@@ -34,10 +16,7 @@
BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
.include "../../security/libgpg-error/buildlink3.mk"
.include "../../security/libksba/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff -r ed2b10c46160 -r ede92139f8e0 security/pinentry/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry/Makefile.common Wed Dec 10 02:27:43 2014 +0000
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile.common,v 1.1 2014/12/10 02:27:43 mef Exp $
+# -*- Makefile -*-
+# used by security/pinentry/Makefile
+# used by security/pinentry-gtk/Makefile
+# used by security/pinentry-gtk2/Makefile
+# used by security/pinentry-qt/Makefile
+# used by security/pinentry-qt4/Makefile
+
+PINENTRY_VERSION= 0.8.3
+DISTNAME= pinentry-${PINENTRY_VERSION}
+
+CATEGORIES= security
+MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
+LICENSE= gnu-gpl-v2
+
+#PATCHDIR= ${.CURDIR}/../../security/pinentry/patches
+DISTINFO_FILE= ${.CURDIR}/../../security/pinentry/distinfo
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
+
+INFO_FILES= yes
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index