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

Fri Jun 1 16:28:54 CEST 2012

Revision: 18195
          http://gar.svn.sourceforge.net/gar/?rev=18195&view=rev
Author:   dmichelsen
Date:     2012-06-01 14:28:54 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
mutt/trunk: Enable external dotlock, general restructuring to latest standards

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

Modified: csw/mgar/pkg/mutt/trunk/Makefile
===================================================================

--- csw/mgar/pkg/mutt/trunk/Makefile	2012-06-01 13:46:28 UTC (rev 18194)
+++ csw/mgar/pkg/mutt/trunk/Makefile	2012-06-01 14:28:54 UTC (rev 18195)
@@ -21,34 +21,83 @@
 DISTFILES   += CSWmutt.postmsg
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
+POSTMSG = $(docdir)/mutt/CSWmutt.postmsg
+
 LICENSE = COPYRIGHT
 
-PACKAGES = CSWmutt CSWmutt-base CSWmutt-ncurses CSWmutt-slang
+PACKAGES += CSWmutt
+SPKG_DESC_CSWmutt = Metapackage for mutt with ncurses- and slang-interface
+RUNTIME_DEP_PKGS_CSWmutt += CSWmutt-ncurses
+RUNTIME_DEP_PKGS_CSWmutt += CSWmutt-slang
+PKGFILES_CSWmutt += $(POSTMSG)
+ARCHALL_CSWmutt = 1
 
-RUNTIME_DEP_PKGS_core  = CSWgdbm
-RUNTIME_DEP_PKGS_core += CSWggettextrt
-RUNTIME_DEP_PKGS_core += CSWgpgerr
-RUNTIME_DEP_PKGS_core += CSWgpgme
-RUNTIME_DEP_PKGS_core += CSWiconv
-RUNTIME_DEP_PKGS_core += CSWlibidn
-RUNTIME_DEP_PKGS_core += CSWosslrt
-RUNTIME_DEP_PKGS_core += CSWsasl
-RUNTIME_DEP_PKGS_core += CSWzlib
-RUNTIME_DEP_PKGS_CSWmutt-ncurses = $(RUNTIME_DEP_PKGS_core) CSWmutt-base CSWncurses
-RUNTIME_DEP_PKGS_CSWmutt-slang   = $(RUNTIME_DEP_PKGS_core) CSWmutt-base CSWslang
-RUNTIME_DEP_PKGS_CSWmutt-base    = CSWggettextrt CSWiconv CSWlibidn
-RUNTIME_DEP_PKGS_CSWmutt         = CSWmutt-ncurses CSWmutt-slang
+# These overrides are specific to the structure of the package
+CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-ncurses
+CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-slang
 
-CATALOGNAME_CSWmutt-base = mutt_base
-CATALOGNAME_CSWmutt-ncurses = mutt_ncurses
-CATALOGNAME_CSWmutt-slang = mutt_slang
-CATALOGNAME_CSWmutt = mutt
+PACKAGES += CSWmutt-base
+SPKG_DESC_CSWmutt-base = $(DESCRIPTION)
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWmutt-base += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWmutt-base += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWmutt-base += CSWlibiconv2
 
-SPKG_DESC_CSWmutt-base = $(DESCRIPTION)
+# This warning from checkpkg is obviously wrong...
+CHECKPKG_OVERRIDES_CSWmutt-base = missing-dependency|CSWperl
+
+PACKAGES += CSWmutt-ncurses
 SPKG_DESC_CSWmutt-ncurses = Mutt mail client with ncurses interface
+PKGFILES_CSWmutt-ncurses = $(bindir)/mutt-ncurses
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibncursesw5
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibz1
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibgdbm4
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWgpgme
+RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWmutt-base
+CHECKPKG_OVERRIDES_CSWmutt-ncurses += surplus-dependency|CSWmutt-base
+
+PACKAGES += CSWmutt-slang
 SPKG_DESC_CSWmutt-slang = Mutt mail client with slang interface
-SPKG_DESC_CSWmutt = Metapackage for mutt with ncurses- and slang-interface
+PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibslang2
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibz1
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWgpgme
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibgdbm4
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWmutt-slang += CSWmutt-base
+CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWmutt-base
 
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/etc/opt/csw/Muttrc.CSW
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/reference.html
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/ChangeLog
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/INSTALL
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/configuration.html
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/samples/sample.muttrc
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/share|root/opt/csw/share/doc/mutt/devel-notes.txt
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/mimesupport.html
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/manual.txt
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/manual.html
+CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/muttrc.5
+CHECKPKG_OVERRIDES_CSWmutt-base += pkginfo-opencsw-repository-uncommitted
+
+REINPLACEMENTS += mailcap
+REINPLACE_MATCH_mailcap = /usr/local/etc/mailcap
+REINPLACE_WITH_mailcap = /opt/csw/etc/mailcap
+REINPLACE_FILES_mailcap += init.c
+REINPLACE_FILES_mailcap += doc/manual.xml
+REINPLACE_FILES_mailcap += doc/mimesupport.html
+
 # Raise optimizer level unless this bug has been fixed:
 #   http://dev.mutt.org/trac/ticket/3347
 OPT_FLAGS_SOS = -xO4
@@ -65,6 +114,7 @@
 CONFIGURE_ARGS += --enable-hcache
 CONFIGURE_ARGS += --with-sasl
 CONFIGURE_ARGS += --with-ssl
+CONFIGURE_ARGS += --enable-external-dotlock
 
 CONFIGURE_ARGS_SLANG-no =
 CONFIGURE_ARGS_SLANG-yes = --with-slang=$(prefix)
@@ -83,34 +133,14 @@
 MERGE_SCRIPTS_isa-default-slang-yes = copy-all
 
 EXTRA_PAX_ARGS_slang-no = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-ncurses,p"
-EXTRA_PAX_ARGS_slang-yes = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-slang,p" -s ",.*,,"
+EXTRA_PAX_ARGS_slang-yes = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-slang,p" -m
 EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_slang-$(SLANG))
 
-POSTMSG = $(docdir)/mutt/CSWmutt.postmsg
-
-# CSWmutt-base gets all the rest
-PKGFILES_CSWmutt-ncurses = $(bindir)/mutt-ncurses
-PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang
-PKGFILES_CSWmutt = $(POSTMSG)
-
-ARCHALL_CSWmutt = 1
-
 ALTERNATIVES_CSWmutt-ncurses = ncurses
 ALTERNATIVES_CSWmutt-slang = slang
 ALTERNATIVE_ncurses = $(bindir)/mutt mutt $(bindir)/mutt-ncurses 100
 ALTERNATIVE_slang = $(bindir)/mutt mutt $(bindir)/mutt-slang 200
 
-# This warning from checkpkg is obviously wrong...
-CHECKPKG_OVERRIDES_CSWmutt-base = missing-dependency|CSWperl
-
-# These overrides are specific to the structure of the package
-CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-ncurses
-CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-slang
-CHECKPKG_OVERRIDES_CSWmutt-ncurses += surplus-dependency|CSWalternatives
-CHECKPKG_OVERRIDES_CSWmutt-ncurses += surplus-dependency|CSWmutt-base
-CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWalternatives
-CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWmutt-base
-
 include gar/category.mk
 
 post-merge:

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

