security/pinentry* converting to use Makefile.common

To: pkgsrc-users%pkgsrc.org@localhost
Subject: security/pinentry* converting to use Makefile.common
From: Makoto Fujiwara <makoto%ki.nu@localhost>
Date: Mon, 08 Dec 2014 14:41:10 +0900
I'd like to update security/pinentry* from 0.8.3 to 0.9.0. But
before doing that, I would convert them to use Makefile.common.

The patch is attached (sorry for lengthy).  This won't
change any built binary to existing setup, I hope and I believe.

Thank you for your attention,
---
mef%NetBSD.org@localhost
Makoto Fujiwara, 
Chiba, Japan, Narita Airport and Disneyland prefecture.

Index: security/pinentry/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/pinentry/Makefile,v
retrieving revision 1.40
diff -u -u -r1.40 Makefile
--- security/pinentry/Makefile	1 Jan 2014 11:52:33 -0000	1.40
+++ security/pinentry/Makefile	8 Dec 2014 05:33:56 -0000
@@ -1,28 +1,10 @@
 # $NetBSD: Makefile,v 1.40 2014/01/01 11:52:33 wiz 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
-
-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"
Index: security/pinentry/Makefile.common
===================================================================
RCS file: security/pinentry/Makefile.common
diff -N security/pinentry/Makefile.common
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ security/pinentry/Makefile.common	8 Dec 2014 05:33:56 -0000
@@ -0,0 +1,30 @@
+# $NetBSD$
+# -*- 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"
Index: security/pinentry-gtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/pinentry-gtk/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- security/pinentry-gtk/Makefile	1 Jan 2014 11:52:33 -0000	1.11
+++ security/pinentry-gtk/Makefile	8 Dec 2014 05:33:56 -0000
@@ -1,22 +1,12 @@
 # $NetBSD: Makefile,v 1.11 2014/01/01 11:52:33 wiz 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"
Index: security/pinentry-gtk2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/pinentry-gtk2/Makefile,v
retrieving revision 1.30
diff -u -u -r1.30 Makefile
--- security/pinentry-gtk2/Makefile	5 May 2014 00:48:19 -0000	1.30
+++ security/pinentry-gtk2/Makefile	8 Dec 2014 05:33:56 -0000
@@ -1,23 +1,13 @@
 # $NetBSD: Makefile,v 1.30 2014/05/05 00:48:19 ryoon 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"
Index: security/pinentry-qt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/pinentry-qt/Makefile,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile
--- security/pinentry-qt/Makefile	1 Jan 2014 11:52:33 -0000	1.20
+++ security/pinentry-qt/Makefile	8 Dec 2014 05:33:56 -0000
@@ -1,22 +1,12 @@
 # $NetBSD: Makefile,v 1.20 2014/01/01 11:52:33 wiz 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"
Index: security/pinentry-qt4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/pinentry-qt4/Makefile,v
retrieving revision 1.29
diff -u -u -r1.29 Makefile
--- security/pinentry-qt4/Makefile	12 Feb 2014 23:18:35 -0000	1.29
+++ security/pinentry-qt4/Makefile	8 Dec 2014 05:33:56 -0000
@@ -1,22 +1,12 @@
 # $NetBSD: Makefile,v 1.29 2014/02/12 23:18:35 tron 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
-
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
-COMMENT=		Applications for entering PINs or Passphrases
+COMMENT=		Applications for entering PINs or Passphrases, qt4 enabled
 
-PATCHDIR=		${.CURDIR}/../../security/pinentry/patches
-DISTINFO_FILE=		${.CURDIR}/../../security/pinentry/distinfo
+.include		"../../security/pinentry/Makefile.common"
 
-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"
Follow-Ups:
- Re: security/pinentry* converting to use Makefile.common
  - From: Makoto Fujiwara
Prev by Date: Re: Add Haiku platform to sysutils/pciutils package
Next by Date: Skrzynka pocztowa zostala tymczasowo zawieszona !!!
Previous by Thread: Add Haiku platform to sysutils/pciutils package
Next by Thread: Re: security/pinentry* converting to use Makefile.common
Indexes:
Home | Main Index | Thread Index | Old Index