From owner-svn-ports-head@FreeBSD.ORG Thu Oct 23 17:30:53 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46E8F9CA; Thu, 23 Oct 2014 17:30:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 192823DF; Thu, 23 Oct 2014 17:30:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9NHUq90055757; Thu, 23 Oct 2014 17:30:52 GMT (envelope-from oliver@FreeBSD.org) Received: (from oliver@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9NHUqJ3055755; Thu, 23 Oct 2014 17:30:52 GMT (envelope-from oliver@FreeBSD.org) Message-Id: <201410231730.s9NHUqJ3055755@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: oliver set sender to oliver@FreeBSD.org using -f From: Oliver Lehmann Date: Thu, 23 Oct 2014 17:30:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371399 - in head/mail/sqwebmail: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 17:30:53 -0000 Author: oliver Date: Thu Oct 23 17:30:52 2014 New Revision: 371399 URL: https://svnweb.freebsd.org/changeset/ports/371399 QAT: https://qat.redports.org/buildarchive/r371399/ Log: fix conflicts with mail/courier-imap Reported by: brent@jeneral.com Added: head/mail/sqwebmail/files/patch-Makefile.in (contents, props changed) Modified: head/mail/sqwebmail/pkg-plist Added: head/mail/sqwebmail/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/sqwebmail/files/patch-Makefile.in Thu Oct 23 17:30:52 2014 (r371399) @@ -0,0 +1,34 @@ +--- Makefile.in 2014-10-23 18:58:08.635738996 +0200 ++++ Makefile.in.orig 2013-12-24 00:50:01.000000000 +0100 +@@ -384,13 +384,13 @@ + + scriptbindir = $(sbindir) + scriptbin_SCRIPTS = \ +- sharedindexinstall.sqwebmail sharedindexsplit.sqwebmail ++ sharedindexinstall sharedindexsplit + + pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd + pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@ + libexec_SCRIPTS = sqwebmaild.rc + CLEANFILES = $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA) \ +- sharedindexinstall.sqwebmail sharedindexsplit.sqwebmail ++ sharedindexinstall sharedindexsplit + + pkgman8dir = @mandir@/man8 + pkgman8_DATA = deliverquota.8 +@@ -1087,11 +1087,11 @@ + makemime: libs/rfc2045/makemime + cp libs/rfc2045/makemime . + +-sharedindexinstall.sqwebmail: libs/maildir/sharedindexinstall +- cp -f libs/maildir/sharedindexinstall ./sharedindexinstall.sqwebmail ++sharedindexinstall: libs/maildir/sharedindexinstall ++ cp -f libs/maildir/sharedindexinstall . + +-sharedindexsplit.sqwebmail: libs/maildir/sharedindexsplit +- cp -f libs/maildir/sharedindexsplit ./sharedindexsplit.sqwebmail ++sharedindexsplit: libs/maildir/sharedindexsplit ++ cp -f libs/maildir/sharedindexsplit . + + # + # Install SqWebMail setuid to root, if we're running as root Modified: head/mail/sqwebmail/pkg-plist ============================================================================== --- head/mail/sqwebmail/pkg-plist Thu Oct 23 15:23:27 2014 (r371398) +++ head/mail/sqwebmail/pkg-plist Thu Oct 23 17:30:52 2014 (r371399) @@ -12,8 +12,8 @@ libexec/sqwebmail/sqwebmaild libexec/sqwebmail/sqwebpasswd libexec/sqwebmaild.rc %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl -sbin/sharedindexinstall -sbin/sharedindexsplit +sbin/sharedindexinstall.sqwebmail +sbin/sharedindexsplit.sqwebmail share/sqwebmail/cleancache.pl share/sqwebmail/html/en share/sqwebmail/html/en-us/CHARSET