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

[jake_goerzen at users.sourceforge.net]

Revision: 14735
          http://gar.svn.sourceforge.net/gar/?rev=14735&view=rev
Author:   jake_goerzen
Date:     2011-06-07 21:42:31 +0000 (Tue, 07 Jun 2011)

Log Message:
-----------
dovecot: cleanup Makefile

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2011-06-07 20:36:38 UTC (rev 14734)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2011-06-07 21:42:31 UTC (rev 14735)
@@ -21,24 +21,19 @@
 DISTFILES      = $(NAME)-$(VERSION).tar.gz
 UFILES_REGEX   = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-# Sieve plugin is packaged via a post-package hook (see package-sieveplugin:)
-PACKAGES  = CSWdovecot CSWdovecot-devel CSWdovecot-sieve
-NOPACKAGE = CSWdovecot-sieve
+PACKAGES  = CSWdovecot CSWdovecot-devel
 
 CATALOGNAME_CSWdovecot = dovecot
 CATALOGNAME_CSWdovecot-devel = dovecot_devel
-CATALOGNAME_CSWdovecot-sieve = dovecot_sieve
 
 SPKG_DESC_CSWdovecot = Secure IMAP server
 SPKG_DESC_CSWdovecot-devel = Dovecot secure IMAP server header files
-SPKG_DESC_CSWdovecot-sieve = Dovecot secure IMAP server sieve plugin
 
 RUNTIME_DEP_PKGS_CSWdovecot       = CSWosslrt CSWmysql5rt CSWoldaprt CSWlibpq
 RUNTIME_DEP_PKGS_CSWdovecot      += CSWzlib CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWdovecot      += CSWbzip2 CSWiconv
 RUNTIME_DEP_PKGS_CSWdovecot      += CSWkrb5lib
 RUNTIME_DEP_PKGS_CSWdovecot-devel = CSWdovecot
-RUNTIME_DEP_PKGS_CSWdovecot-sieve = CSWdovecot
 
 BUILD_DEP_PKGS  = CSWossldevel CSWosslrt
 BUILD_DEP_PKGS += CSWmysql5devel CSWmysql5rt
@@ -47,7 +42,6 @@
 BUILD_DEP_PKGS += CSWkrb5lib CSWkrb5libdev
 
 PKGFILES_CSWdovecot-devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWdovecot-sieve = .*sieve.*
 
 # These directories belong to CSWosslrt
 PROTOTYPE_FILTER  = awk '\
@@ -87,9 +81,12 @@
 # cswclassutils integration
 INITSMF    = $(sysconfdir)/init.d/cswdovecot
 USERGROUP  = dovecot:dovecot:Dovecot IMAP Server:/var/opt/csw/run/dovecot/login:/bin/false
-SAMPLECONF = .*/dovecot.pem $(sysconfdir)/dovecot.conf
-MIGRATE_FILES = dovecot.conf
+SAMPLECONF_CSWdovecot = .*/dovecot.pem $(sysconfdir)/dovecot.conf
+MIGRATE_FILES_CSWdovecot = dovecot.conf
 
+CHECKPKG_OVERRIDES_CSWdovecot += bad-rpath-entry|/opt/csw/lib/|opt/csw/libexec/dovecot/dovecot-auth
+CHECKPKG_OVERRIDES_CSWdovecot += bad-rpath-entry|/opt/csw/lib/|opt/csw/sbin/dovecotpw
+
 include gar/category.mk
 
 # Adjust file paths in various files. Not a prerequisite to the remaining 
@@ -104,9 +101,6 @@
 		s| /usr/lib/dovecot| /opt/csw/lib/dovecot|; \
 		s| /usr/local| /opt/csw/|;' \
 		$(WORKSRC)/*-example.conf
-# replace bad paths with /opt/csw in doc/wiki/*.txt
-	perl -pi -e 's|/usr/share|/opt/csw/share|' $(WORKSRC)/doc/wiki/*.txt
-	perl -pi -e 's|/usr/local|/opt/csw|' $(WORKSRC)/doc/wiki/*.txt
 	@$(MAKECOOKIE)
 
 post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(NAME)
@@ -139,13 +133,17 @@
 	# Copy init script
 	ginstall -Dm 755 $(FILEDIR)/cswdovecot  \
 		$(DESTDIR)/etc/opt/csw/init.d/cswdovecot
-	@$(MAKECOOKIE)
 
-post-package: package-sieveplugin
+	# Search replace paths in docs
+	perl -pi -e 's|/usr/share|/opt/csw/share|' \
+		$(DESTDIR)/opt/csw/share/doc/dovecot/wiki/*
+	perl -pi -e 's|/usr/local|/opt/csw|' \
+		$(DESTDIR)/opt/csw/share/doc/dovecot/wiki/*
 	@$(MAKECOOKIE)
 
-# Extra targets for the Sieve plugin build and packaging process, invoked
-# via post-install-modulated and post-package.
+# Extra targets for the Sieve plugin build process, invoked via post-install-modulated.
+# There used to be a separate sieve package but the sieve related files are now included
+# in the main CSWdovecot package.
 
 SIEVEVERSION = 1.1.8
 SIEVEDIST    = dovecot-sieve-$(SIEVEVERSION)
@@ -163,11 +161,11 @@
 		$(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS); \
 		$(BUILD_ENV) gmake $(BUILD_ARGS); \
 		$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) $(INSTALL_ARGS) install; )
+	# search and replace paths for sieveplugin doc files
+	perl -pi -e 's|/usr/share|/opt/csw/share|' \
+		$(DESTDIR)/opt/csw/share/doc/dovecot/wiki/*
+	perl -pi -e 's|/usr/local|/opt/csw|' \
+		$(DESTDIR)/opt/csw/share/doc/dovecot/wiki/*
+
 	rm -rf $(SIEVEDIST)*
 	@$(MAKECOOKIE)
-
-# Sieve plugin needs to be packaged with version != $(VERSION)
-package-sieveplugin:
-	gmake -o post-package \
-		NOPACKAGE="CSWdovecot CSWdovecot-devel" SPKG_VERSION=$(SIEVEVERSION) \
-		repackage


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