Bug 189016

Comment 1 Edwin Groothuis 2014-04-26 14:20:05 UTC

Responsible Changed
From-To: freebsd-ports-bugs->sunpoet

sunpoet@ wants this submitter's PRs (via the GNATS Auto Assign Tool)

Comment 2 dfilter service 2014-04-26 19:16:39 UTC

Author: sunpoet
Date: Sat Apr 26 18:16:34 2014
New Revision: 352355
URL: http://svnweb.freebsd.org/changeset/ports/352355
QAT: https://qat.redports.org/buildarchive/r352355/

Log:
  - Update to 3.9
  - While I'm here:
    - Simplify pre-install:
    - Remove .include <bsd.port.options.mk>
    - Remove unnecessary SUB_LISTS
  
  Changes:	http://cn.wordpress.org/2014/04/19/smith/
  PR:		ports/189016
  Submitted by:	Joe Horn <joehorn@gmail.com> (maintainer)

Modified:
  head/chinese/wordpress-zh_CN/Makefile
  head/chinese/wordpress-zh_CN/distinfo

Modified: head/chinese/wordpress-zh_CN/Makefile
==============================================================================
--- head/chinese/wordpress-zh_CN/Makefile	Sat Apr 26 18:16:30 2014	(r352354)
+++ head/chinese/wordpress-zh_CN/Makefile	Sat Apr 26 18:16:34 2014	(r352355)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wordpress
-PORTVERSION=	3.8.1
+PORTVERSION=	3.9
 CATEGORIES=	chinese www
 MASTER_SITES=	http://cn.wordpress.org/ \
 		http://mirror.joehorn.idv.tw/wordpress/
@@ -27,8 +27,7 @@ PORTDOCS=	readme.html
 
 OPTIONS_DEFINE=	DOCS
 
-SUB_FILES+=	pkg-message
-SUB_LISTS+=	WWWDIR=${WWWDIR}
+SUB_FILES=	pkg-message
 
 pre-everything::
 	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
@@ -36,27 +35,20 @@ pre-everything::
 	@sleep 1
 
 pre-install:
-	cd ${WRKSRC} && ${FIND} -s * -type f | \
-		${SED} -e 's|^|${WWWDIR:S|${PREFIX}/||}/|' > ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm ${WWWDIR:S|${PREFIX}/||}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${WWWDIR:S|${PREFIX}/||} >> ${PLIST}
+	${ECHO_CMD} '@owner www' > ${PLIST}
+	${ECHO_CMD} '@group www' >> ${PLIST}
+	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
+	cd ${WRKSRC}/ && ${FIND} -d . -type d | ${SED} -e 's|^\.|@dirrm %%WWWDIR%%|' >> ${PLIST}
+	${ECHO_CMD} '@owner' >> ${PLIST}
+	${ECHO_CMD} '@group' >> ${PLIST}
 	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
 		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
 
-.include <bsd.port.options.mk>
-
 do-install:
-	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
-		>> ${TMPPLIST}
-	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' >> ${TMPPLIST}
-	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i}
-.endfor
+	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
+	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
+	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w '{}' \;
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/chinese/wordpress-zh_CN/distinfo
==============================================================================
--- head/chinese/wordpress-zh_CN/distinfo	Sat Apr 26 18:16:30 2014	(r352354)
+++ head/chinese/wordpress-zh_CN/distinfo	Sat Apr 26 18:16:34 2014	(r352355)
@@ -1,2 +1,2 @@
-SHA256 (wordpress-3.8.1-zh_CN.tar.gz) = b46c2a11379391d9e80c6bc2ab4b629d9ec912c5a97f6fc8cb26193654b8fe2a
-SIZE (wordpress-3.8.1-zh_CN.tar.gz) = 6283476
+SHA256 (wordpress-3.9-zh_CN.tar.gz) = 1f46c95726ea03c7bb1fe1fefeae3d4f7869d3598dec4698885fd1bb46ac9041
+SIZE (wordpress-3.9-zh_CN.tar.gz) = 6332779
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 3 Po-Chuan Hsieh 2014-04-26 19:35:21 UTC

State Changed
From-To: open->closed

Committed. Thanks!