From owner-svn-ports-head@freebsd.org Fri Sep 22 19:50:33 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67FE7E0ABB9; Fri, 22 Sep 2017 19:50:33 +0000 (UTC) (envelope-from oliver@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 423D97C483; Fri, 22 Sep 2017 19:50:33 +0000 (UTC) (envelope-from oliver@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8MJoWmJ018774; Fri, 22 Sep 2017 19:50:32 GMT (envelope-from oliver@FreeBSD.org) Received: (from oliver@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MJoWZH018772; Fri, 22 Sep 2017 19:50:32 GMT (envelope-from oliver@FreeBSD.org) Message-Id: <201709221950.v8MJoWZH018772@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oliver set sender to oliver@FreeBSD.org using -f From: Oliver Lehmann Date: Fri, 22 Sep 2017 19:50:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450399 - in head/mail/sqwebmail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: oliver X-SVN-Commit-Paths: in head/mail/sqwebmail: . files X-SVN-Commit-Revision: 450399 X-SVN-Commit-Repository: ports 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.23 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: Fri, 22 Sep 2017 19:50:33 -0000 Author: oliver Date: Fri Sep 22 19:50:32 2017 New Revision: 450399 URL: https://svnweb.freebsd.org/changeset/ports/450399 Log: rename files which conflict with mail/courier-imap PR: 221403 Submitted by: atara-y@mx.scn.tv Modified: head/mail/sqwebmail/files/patch-Makefile.in head/mail/sqwebmail/pkg-plist Modified: head/mail/sqwebmail/files/patch-Makefile.in ============================================================================== --- head/mail/sqwebmail/files/patch-Makefile.in Fri Sep 22 19:00:41 2017 (r450398) +++ head/mail/sqwebmail/files/patch-Makefile.in Fri Sep 22 19:50:32 2017 (r450399) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2013-12-24 00:50:01.000000000 +0100 -+++ Makefile.in 2014-10-23 22:36:30.826836195 +0200 -@@ -384,13 +384,13 @@ +--- Makefile.in.orig 2017-06-23 20:05:50.000000000 +0900 ++++ Makefile.in 2017-08-11 02:13:12.050582000 +0900 +@@ -395,18 +395,18 @@ scriptbindir = $(sbindir) scriptbin_SCRIPTS = \ @@ -15,8 +15,34 @@ + sharedindexinstall.sqwebmail sharedindexsplit.sqwebmail pkgman8dir = @mandir@/man8 - pkgman8_DATA = deliverquota.8 -@@ -1087,11 +1087,11 @@ +-pkgman8_DATA = deliverquota.8 ++pkgman8_DATA = deliverquota.sqwebmail.8 + pkgman1dir = @mandir@/man1 +-pkgman1_DATA = maildirmake.1 ++pkgman1_DATA = maildirmake.sqwebmail.1 + WWW = $$HOME/www/www.courier-mta.org + @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index.html + all: config.h +@@ -1091,14 +1091,14 @@ + maildirmake: libs/maildir/maildirmake + cp libs/maildir/maildirmake . + +-maildirmake.1: libs/maildir/maildirmake.1 +- cp libs/maildir/maildirmake.1 . ++maildirmake.sqwebmail.1: libs/maildir/maildirmake.1 ++ cp libs/maildir/maildirmake.1 maildirmake.sqwebmail.1 + + deliverquota: libs/maildir/deliverquota + cp libs/maildir/deliverquota . + +-deliverquota.8: libs/maildir/deliverquota.8 +- cp libs/maildir/deliverquota.8 . ++deliverquota.sqwebmail.8: libs/maildir/deliverquota.8 ++ cp libs/maildir/deliverquota.8 deliverquota.sqwebmail.8 + + reformime: libs/rfc2045/reformime + cp libs/rfc2045/reformime . +@@ -1106,11 +1106,11 @@ makemime: libs/rfc2045/makemime cp libs/rfc2045/makemime . Modified: head/mail/sqwebmail/pkg-plist ============================================================================== --- head/mail/sqwebmail/pkg-plist Fri Sep 22 19:00:41 2017 (r450398) +++ head/mail/sqwebmail/pkg-plist Fri Sep 22 19:50:32 2017 (r450399) @@ -9,8 +9,8 @@ libexec/sqwebmail/reformime libexec/sqwebmail/sqwebmaild @(%%MAILOWN%%,%%MAILGRP%%,2755) libexec/sqwebmail/sqwebpasswd libexec/sqwebmaild.rc -man/man1/maildirmake.1.gz -man/man8/deliverquota.8.gz +man/man1/maildirmake.sqwebmail.1.gz +man/man8/deliverquota.sqwebmail.8.gz %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl sbin/sharedindexinstall.sqwebmail sbin/sharedindexsplit.sqwebmail