[csw-devel] SF.net SVN: gar:[19722] csw/mgar/pkg/dovecot/trunk
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Thu Nov 22 16:55:20 CET 2012
Revision: 19722
http://gar.svn.sourceforge.net/gar/?rev=19722&view=rev
Author: wilbury
Date: 2012-11-22 15:55:20 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
dovecot/trunk: Update to 2.1.10, some minor recipe tweaking
Modified Paths:
--------------
csw/mgar/pkg/dovecot/trunk/Makefile
csw/mgar/pkg/dovecot/trunk/checksums
Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile 2012-11-20 16:37:19 UTC (rev 19721)
+++ csw/mgar/pkg/dovecot/trunk/Makefile 2012-11-22 15:55:20 UTC (rev 19722)
@@ -2,7 +2,7 @@
# - SSL certs to /etc/opt/csw/ssl?
# - /var/run/dovecot instead of /var/opt/csw/run?
NAME = dovecot
-VERSION = 2.0.21
+VERSION = 2.1.10
GARTYPE = v2
DESCRIPTION = Secure IMAP server
@@ -14,10 +14,12 @@
endef
SPKG_SOURCEURL = http://dovecot.org/
-MASTER_SITES = http://dovecot.org/releases/2.0/
+MASTER_SITES = http://dovecot.org/releases/2.1/
DISTFILES = $(NAME)-$(VERSION).tar.gz
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+GARCOMPILER = SOS12
+
PACKAGES = CSWdovecot CSWdovecot-dev
CATALOGNAME_CSWdovecot = dovecot
@@ -33,11 +35,8 @@
RUNTIME_DEP_PKGS_CSWdovecot += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWdovecot += CSWlibz1
RUNTIME_DEP_PKGS_CSWdovecot += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWdovecot += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWdovecot += CSWlibkrb5-3
RUNTIME_DEP_PKGS_CSWdovecot += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWdovecot += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWdovecot += CSWlibpq
+RUNTIME_DEP_PKGS_CSWdovecot += CSWlibpq5
RUNTIME_DEP_PKGS_CSWdovecot += CSWlibsqlite3-0
RUNTIME_DEP_PKGS_CSWdovecot += CSWlibssl0-9-8
RUNTIME_DEP_PKGS_CSWdovecot += CSWlibssl1-0-0
@@ -52,23 +51,30 @@
$$$$3 == "/opt/csw/ssl/private" { next } \
{ print }'
+REINPLACEMENTS += ul
+
+REINPLACE_MATCH_ul = /usr/local
+REINPLACE_WITH_ul = $(prefix)
+REINPLACE_FILES_ul += src/plugins/fts/decode2text.sh
+REINPLACE_FILES_ul += doc/wiki/LDA.Sendmail.txt
+REINPLACE_FILES_ul += doc/dovecot/wiki/CompilingSource.txt
+REINPLACE_FILES_ul += doc/dovecot/wiki/LDA.Sendmail.txt
+
# No test suite for Dovecot available
TEST_SCRIPTS =
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += MYSQL_LIBS="-L/opt/csw/mysql5/lib -L/opt/csw/lib -L/opt/csw/mysql5/lib/mysql -lmysqlclient -L/opt/csw/lib -lz -lposix4 -lresolv -lc -lgen -lsocket -lnsl -lm"
CONFIGURE_ARGS += --with-gssapi
CONFIGURE_ARGS += --with-ldap
CONFIGURE_ARGS += --with-mysql
CONFIGURE_ARGS += --with-pgsql
CONFIGURE_ARGS += --with-sqlite
CONFIGURE_ARGS += --with-ssl=openssl
-CONFIGURE_ARGS += --with-ssldir=/opt/csw/ssl
+CONFIGURE_ARGS += --with-ssldir=/etc/opt/csw/ssl
CONFIGURE_ARGS += --with-zlib
CONFIGURE_ARGS += --with-bzlib
-EXTRA_LIB = /opt/csw/postgresql/lib
-EXTRA_INC = /opt/csw/include/mysql /opt/csw/postgresql/include
+EXTRA_INC = /opt/csw/include/mysql /opt/csw/include/postgresql
STRIP_DIRS = $(DESTDIR)$(libexecdir)/dovecot
@@ -81,25 +87,21 @@
# the perl search and replace is missing this. Need to rework the below perl
# lines. For now overriding since the file(s) are only documentation.
-CHECKPKG_OVERRIDES_CSWdovecot = file-with-bad-content|/usr/local|root/opt/csw/share/doc/dovecot/wiki/CompilingSource.txt
-CHECKPKG_OVERRIDES_CSWdovecot += file-with-bad-content|/usr/local|root/opt/csw/share/doc/dovecot/wiki/HowTo.PopBSMTPAndDovecot.txt
-CHECKPKG_OVERRIDES_CSWdovecot += file-with-bad-content|/usr/local|root/opt/csw/share/doc/dovecot/wiki/LDA.Sendmail.txt
-
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
include gar/category.mk
pre-install-modulated:
- perl -pi -e 's|/etc/ssl|/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh
+ perl -pi -e 's|/etc/ssl|/etc/opt/csw/ssl|' $(WORKSRC)/doc/mkcert.sh
perl -pi -e '\
s| /var/run| /var/opt/csw/run|; \
- s| /etc/ssl| /opt/csw/ssl|; \
+ s| /etc/ssl| /etc/opt/csw/ssl|; \
s| /usr/libexec| /opt/csw/libexec|; \
s| /usr/lib/dovecot| /opt/csw/lib/dovecot|; \
s| /usr/local| /opt/csw|;' \
$(WORKSRC)/doc/example-config/dovecot.conf
perl -pi -e '\
- s|/etc/ssl|/opt/csw/ssl|; \
+ s|/etc/ssl|/etc/opt/csw/ssl|; \
s|/usr/local|/opt/csw|;' \
$(WORKSRC)/doc/example-config/conf.d/*
@$(MAKECOOKIE)
@@ -107,11 +109,11 @@
post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(NAME)
post-install-modulated: DOCS = NEWS AUTHORS COPYING.LGPL COPYING.MIT
post-install-modulated: CSWDOCS=README.CSW changelog.CSW
-post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl
+post-install-modulated: SSLDIR = $(DESTDIR)/etc/opt/csw/ssl
post-install-modulated:
perl -pi -e '\
- s|/etc/ssl|/opt/csw/ssl|; \
+ s|/etc/ssl|/etc/opt/csw/ssl|; \
s|/usr/local|/opt/csw|; \
s|/usr/share|/opt/csw/share|;' \
$(DESTDIR)/opt/csw/share/doc/dovecot/wiki/*
Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums 2012-11-20 16:37:19 UTC (rev 19721)
+++ csw/mgar/pkg/dovecot/trunk/checksums 2012-11-22 15:55:20 UTC (rev 19722)
@@ -1 +1 @@
-b19d29dcd865c86de76b9ad3d7d3af03 dovecot-2.0.21.tar.gz
+a5a4b3c444cf37e2c6bb6df3af87e18e dovecot-2.1.10.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list