Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Feb 2014 16:25:47 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r343938 - head/www/tinymce
Message-ID:  <201402121625.s1CGPloq073282@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Wed Feb 12 16:25:47 2014
New Revision: 343938
URL: http://svnweb.freebsd.org/changeset/ports/343938
QAT: https://qat.redports.org/buildarchive/r343938/

Log:
  - Update maintainer section
  - Simplify Makefile

Modified:
  head/www/tinymce/Makefile

Modified: head/www/tinymce/Makefile
==============================================================================
--- head/www/tinymce/Makefile	Wed Feb 12 16:11:06 2014	(r343937)
+++ head/www/tinymce/Makefile	Wed Feb 12 16:25:47 2014	(r343938)
@@ -19,18 +19,18 @@ CONFLICTS_INSTALL=	tinymce-[0-35-9]* tin
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+post-extract:
+	@cd ${WRKSRC}/ && ${FIND} -s * -type d -empty | ${XARGS} -I % ${TOUCH} %/.keepme
+
 do-install:
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 
 # maintainer section:
 
 #MS_DIRRMTRY=	# empty
-MS_EMPTYDIRS=	${WRKDIR}/.ms-empty-directories
 MS_PLIST=	${WRKDIR}/.ms-pkg-plist
 
 genplist: do-clean extract
-	cd ${WRKSRC}/ && ${FIND} -s * -type d -empty | ${XARGS} >> ${MS_EMPTYDIRS}
-	${SED} 's|[^ ]*|&/.keepme|g' ${MS_EMPTYDIRS} | ${XARGS} -J % ${TOUCH} %
 	${ECHO} "@owner www" > ${MS_PLIST}
 	${ECHO} "@group www" >> ${MS_PLIST}
 	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST}
@@ -42,6 +42,5 @@ genplist: do-clean extract
 #	${REINPLACE_CMD} '/^@dirrm %%WWWDIR%%\/${dir:C/\//\\\//g}$$/ s|@dirrm|&try|' ${MS_PLIST}
 #.endfor
 	${INSTALL} -m 600 ${MS_PLIST} ${PLIST}
-	${REINPLACE_CMD} -e "/^EMPTYDIRS=/ s|	.*$$|	`${CAT} ${MS_EMPTYDIRS}`|" ${.CURDIR}/Makefile
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402121625.s1CGPloq073282>