[csw-devel] SF.net SVN: gar:[15038] csw/mgar/pkg/pinentry/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 15038
          http://gar.svn.sourceforge.net/gar/?rev=15038&view=rev
Author:   dmichelsen
Date:     2011-07-11 10:26:41 +0000 (Mon, 11 Jul 2011)

Log Message:
-----------
pinentry: Split packages, add alternatives

Modified Paths:
--------------
    csw/mgar/pkg/pinentry/trunk/Makefile

Modified: csw/mgar/pkg/pinentry/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pinentry/trunk/Makefile	2011-07-11 09:51:32 UTC (rev 15037)
+++ csw/mgar/pkg/pinentry/trunk/Makefile	2011-07-11 10:26:41 UTC (rev 15038)
@@ -18,26 +18,50 @@
 BUILD_DEP_PKGS += CSWlibgnugetopt-dev
 BUILD_DEP_PKGS += CSWggettext-dev
 BUILD_DEP_PKGS += CSWlibncurses-dev
-BUILD_DEP_PKGS += CSWglib
+BUILD_DEP_PKGS += CSWglib2devel
 BUILD_DEP_PKGS += CSWgtk2devel
+BUILD_DEP_PKGS += CSWatk2devel
+BUILD_DEP_PKGS += CSWpangodevel
+BUILD_DEP_PKGS += CSWlibcairo-dev
 
+PACKAGES += CSWpinentry
+SPKG_DESC_CSWpinentry = Allows entering passwords into gpg-agent (ncurses version)
+# PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWpinentry += CSWlibgnugetopt0
-RUNTIME_DEP_PKGS_CSWpinentry += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpinentry += CSWiconv
 RUNTIME_DEP_PKGS_CSWpinentry += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWpinentry += CSWglib
-RUNTIME_DEP_PKGS_CSWpinentry += CSWgtk
-RUNTIME_DEP_PKGS_CSWpinentry += CSWiconv
-RUNTIME_DEP_PKGS_CSWpinentry += CSWglib2
-RUNTIME_DEP_PKGS_CSWpinentry += CSWftype2
-RUNTIME_DEP_PKGS_CSWpinentry += CSWgtk2
-RUNTIME_DEP_PKGS_CSWpinentry += CSWlibatk
-RUNTIME_DEP_PKGS_CSWpinentry += CSWfconfig
-RUNTIME_DEP_PKGS_CSWpinentry += CSWpango
-RUNTIME_DEP_PKGS_CSWpinentry += CSWlibcairo2
 
+PACKAGES += CSWpinentry-gtk2
+SPKG_DESC_CSWpinentry-gtk2 = Allows entering passwords into gpg-agent (gtk2 version)
+PKGFILES_CSWpinentry-gtk2 += $(bindir)/pinentry-gtk-2
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWiconv
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWftype2
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibgnugetopt0
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWgtk2
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibatk
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWpango
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWglib2
+RUNTIME_DEP_PKGS_CSWpinentry-gtk2 += CSWlibcairo2
+
 # This is passed to curses/, but not pinentry/
 EXTRA_CPPFLAGS += -I$(includedir)/ncurses
 
 EXTRA_LINKER_FLAGS += -lgnugetopt
 
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --enable-pinentry-curses
+CONFIGURE_ARGS += --disable-pinentry-gtk
+CONFIGURE_ARGS += --enable-pinentry-gtk2
+
+# This is a symlink, we replace that by alternatives
+EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/pinentry
+
+ALTERNATIVES_CSWpinentry = ncurses
+ALTERNATIVES_CSWpinentry-gtk2 = gtk2
+ALTERNATIVE_ncurses = $(bindir)/pinentry pinentry $(bindir)/pinentry-curses 100
+ALTERNATIVE_gtk2 = $(bindir)/pinentry pinentry $(bindir)/pinentry-gtk-2 200
+
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.