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

[chninkel at users.sourceforge.net]

Revision: 20841
          http://gar.svn.sourceforge.net/gar/?rev=20841&view=rev
Author:   chninkel
Date:     2013-04-22 19:06:37 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
mailutils/trunk: removed useless checkpkg overrides and fixed post-merge/install scripts

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

Modified: csw/mgar/pkg/mailutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailutils/trunk/Makefile	2013-04-22 13:56:11 UTC (rev 20840)
+++ csw/mgar/pkg/mailutils/trunk/Makefile	2013-04-22 19:06:37 UTC (rev 20841)
@@ -33,10 +33,9 @@
 CHECKPKG_OVERRIDES_CSWmailutils += shared-lib-pkgname-mismatch
 CHECKPKG_OVERRIDES_CSWmailutils += shared-lib-package-contains-so-symlink
 
+# Emacs dependency is optional
 CHECKPKG_OVERRIDES_CSWmailutils += missing-dependency|CSWemacs-common
 
-CHECKPKG_OVERRIDES_CSWmailutils += file-with-bad-content|/usr/local|root/opt/csw/bin/mimeview
-CHECKPKG_OVERRIDES_CSWmailutils += file-with-bad-content|/usr/local|root/opt/csw/bin/mail
 
 # Workaround a bug with krb5-config 
 # see https://www.opencsw.org/mantis/view.php?id=5007
@@ -104,11 +103,14 @@
 	cd $(WORKSRC)/include/mailutils && $(MAKE) types.h
 
 post-install:
-	@$(MAKECOOKIE)
 	for FILE in $(DOCFILES); do \
                 ginstall -D "$(WORKSRC)/$$FILE" "$(PKGROOT)$(docdir)/$(NAME)/$$FILE"; \
         done
 	ginstall -D "$(FILEDIR)/README.CSW" "$(PKGROOT)$(docdir)/$(NAME)/README.CSW"
 	ginstall -D "$(FILEDIR)/mailutils.rc" "$(PKGROOT)$(sysconfdir)/mailutils.rc.CSW"
+	@$(MAKECOOKIE)
+
+post-merge:
 	rm -f "$(PKGROOT)$(libdir)/charset.alias"
+	@$(MAKECOOKIE)
 

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