From owner-svn-ports-all@FreeBSD.ORG  Sun Dec  2 19:32:49 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3B7ACEB1;
 Sun,  2 Dec 2012 19:32:49 +0000 (UTC)
 (envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 05C4A8FC08;
 Sun,  2 Dec 2012 19:32:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB2JWmLO044354;
 Sun, 2 Dec 2012 19:32:48 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB2JWmxe044352;
 Sun, 2 Dec 2012 19:32:48 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201212021932.qB2JWmxe044352@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sun, 2 Dec 2012 19:32:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308115 - in head: . www/owncloud
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Dec 2012 19:32:49 -0000

Author: crees
Date: Sun Dec  2 19:32:48 2012
New Revision: 308115
URL: http://svnweb.freebsd.org/changeset/ports/308115

Log:
  Don't clobber configuration files if reinstalled.
  
  No PORTREVISION bump, because otherwise many will blindly update and possibly
  lose everything.  Hopefully people will read UPDATING before the next update!
  
  PR:		ports/173238
  PR:		ports/173233
  Submitted by:	crees
  Approved by:	kevlo (maintainer)
  Feature safe:	yes

Modified:
  head/UPDATING
  head/www/owncloud/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Dec  2 17:12:51 2012	(r308114)
+++ head/UPDATING	Sun Dec  2 19:32:48 2012	(r308115)
@@ -5,6 +5,24 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20121202:
+  AFFECTS: Users of www/owncloud
+  AUTHOR: crees@FreeBSD.org
+
+  www/owncloud includes the entire WWWDIR directory structure in pkg-plist.
+
+  This means that if you upgrade it, your config files are added to pkg-plist,
+  and are then removed on the next deinstall.
+
+  This issue has been fixed, but you must back up your install of owncloud and
+  reinstall to avoid data loss;
+
+  # cd /usr/ports/www/owncloud
+  # tar cfC /tmp/owncloud.tar `make -VWWWDIR` .
+  # make deinstall
+  # tar xfC /tmp/owncloud.tar `make -VWWWDIR`
+  # make install clean && rm /tmp/owncloud.tar
+
 20121201:
   AFFECTS: Users of www/typo3
   AUTHOR: Helmut Ritter <freebsd-ports@charlieroot.de>

Modified: head/www/owncloud/Makefile
==============================================================================
--- head/www/owncloud/Makefile	Sun Dec  2 17:12:51 2012	(r308114)
+++ head/www/owncloud/Makefile	Sun Dec  2 19:32:48 2012	(r308115)
@@ -30,9 +30,11 @@ do-install:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-	@${FIND} -s -d ${WWWDIR} -type f -print | \
-		${SED} -e "s#${PREFIX}/##g" >> ${TMPPLIST}
-	@${FIND} -s -d ${WWWDIR} -type d  -print | \
-		${SED} -E -e "s#${PREFIX}/#@dirrm #g" >> ${TMPPLIST}
+	@cd ${WRKSRC} && \
+	    ${FIND} -s -d . -type f -print | \
+		${SED} -e "s#^\.#${WWWDIR_REL}#" >> ${TMPPLIST}
+	@cd ${WRKSRC} && \
+	    ${FIND} -s -d . -type d  -print | \
+		${SED} -e "s#^\.#@dirrm ${WWWDIR_REL}#" >> ${TMPPLIST}
 
 .include <bsd.port.mk>