svn commit: r308115 - in head: . www/owncloud

[Chris Rees]

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 at 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 at 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>