Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Jan 2013 19:09:20 +0900
From:      Takefu <takefu@airport.fm>
To:        freebsd-gnats-submit@freebsd.org
Cc:        ychsiao@ychsiao.org, 9267096@gmail.com
Subject:   ports/175525: [PATCH] german, japanese, russian/wordpress: update to 3.5, 1
Message-ID:  <50FFB6D0.8040605@airport.fm>
Resent-Message-ID: <201301231010.r0NAA0eC002841@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         175525
>Category:       ports
>Synopsis:       [PATCH] german,japanese,russian/wordpress: update to 3.5,1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 23 10:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Takefu
>Release:        FreeBSD 7.4-RELEASE-p11 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG74.localIPv4.airport.fm 7.4-RELEASE-p11 FreeBSD 7.4-RELEASE-p11 #0: Tue Dec  4 15:31:56 JST
>Description:
german,japanese
- Update to 3.5,1

russian
- Change tarball
- fix OptionNG

russian,www
- fix install permission

Added file(s):
russian,www
- files/pkg-install.in
www
- files/pkg-message.in

Removed file(s):
www
- pkg-message

german
Port maintainer (miwi@FreeBSD.org) is cc'd.
russian
Port maintainer (9267096@gmail.com) is cc'd.
www
Port maintainer (ychsiao@ychsiao.org) is cc'd.


--- de-wordpress-3.5,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/german/wordpress/Makefile ./Makefile
--- /usr/ports/german/wordpress/Makefile	2012-11-17 14:58:00.000000000 +0900
+++ ./Makefile	2013-01-23 17:48:55.000000000 +0900
@@ -1,9 +1,10 @@
-# Created by:	miwi
+# Created by: miwi
 # $FreeBSD: ports/german/wordpress/Makefile,v 1.48 2012/11/17 05:58:00 svnexp Exp $
 #

 PORTNAME=	wordpress
-PORTVERSION=	3.4.2
+PORTVERSION=	3.5
+PORTEPOCH=	1
 CATEGORIES=	german www
 MASTER_SITES=	http://de.wordpress.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-de_DE
diff -ruN --exclude=CVS /usr/ports/german/wordpress/distinfo ./distinfo
--- /usr/ports/german/wordpress/distinfo	2012-10-14 02:46:26.000000000 +0900
+++ ./distinfo	2013-01-23 17:46:38.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (wordpress-3.4.2-de_DE.tar.gz) = d84bfb5a900048f51f5d964a6277228df2514046cd6ab175146e02fd0ee0f658
-SIZE (wordpress-3.4.2-de_DE.tar.gz) = 4944236
+SHA256 (wordpress-3.5-de_DE.tar.gz) = 8eb1c1e993de625170e20782241da69e09eef09b323edbaf51714cce7cfacd1e
+SIZE (wordpress-3.5-de_DE.tar.gz) = 6144294
--- de-wordpress-3.5,1.patch ends here ---


--- ja-wordpress-3.5,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/japanese/wordpress/Makefile ./Makefile
--- /usr/ports/japanese/wordpress/Makefile	2012-11-17 14:58:41.000000000 +0900
+++ ./Makefile	2013-01-23 18:47:54.000000000 +0900
@@ -2,7 +2,8 @@
 # $FreeBSD: ports/japanese/wordpress/Makefile,v 1.8 2012/11/17 05:58:41 svnexp Exp $

 PORTNAME=	wordpress
-PORTVERSION=	3.4.2
+PORTVERSION=	3.5
+PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://ja.wordpress.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-ja
@@ -26,6 +27,8 @@
 PLIST=		${WRKDIR}/pkg-plist
 PORTDOCS=	license.txt readme.html

+OPTIONS_DEFINE=	DOCS
+
 pre-everything::
 	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
 	@${ECHO_CMD} ""
diff -ruN --exclude=CVS /usr/ports/japanese/wordpress/distinfo ./distinfo
--- /usr/ports/japanese/wordpress/distinfo	2012-10-14 02:16:53.000000000 +0900
+++ ./distinfo	2013-01-23 17:42:04.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (wordpress-3.4.2-ja.tar.gz) = a8caa2bf5100583c40f3236e78b200514e6e76a6b99d1caf1298e616d9e64952
-SIZE (wordpress-3.4.2-ja.tar.gz) = 4970768
+SHA256 (wordpress-3.5-ja.tar.gz) = 190e8cbfa2e75592519b750bdcfdac37393990c11d196c036b470b86f9939ec2
+SIZE (wordpress-3.5-ja.tar.gz) = 6168936
--- ja-wordpress-3.5,1.patch ends here ---


--- ru-wordpress-3.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/russian/wordpress/Makefile ./Makefile
--- /usr/ports/russian/wordpress/Makefile	2012-12-17 04:34:15.000000000 +0900
+++ ./Makefile	2013-01-23 18:48:46.000000000 +0900
@@ -8,21 +8,25 @@
 DISTNAME=	${PORTNAME}-${PORTVERSION}-ru_RU

 MAINTAINER=	9267096@gmail.com
-COMMENT=	State-of-the-art semantic personal publishing platform
+COMMENT=	A state-of-the-art semantic personal publishing platform

 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/license.txt

 CONFLICTS_INSTALL=	wordpress-3.* de-wordpress-3.* ja-wordpress-3.*

 NO_BUILD=	yes
-USE_ZIP=	yes
 USE_PHP=	curl gd mysql pcre tokenizer xml zip
 WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}

+SUB_FILES=	pkg-message pkg-install
+SUB_LIST=	CHGRP="${CHGRP}" CHOWN="${CHOWN}" CHMOD="${CHMOD}"\
+		FIND="${FIND}" WWWGRP="${WWWGRP}" WWWOWN="${WWWOWN}"
 PLIST=		${WRKDIR}/pkg-plist
-PORTDOCS=	readme.html
-SUB_FILES=	pkg-message
+PORTDOCS=	license.txt readme.html
+
+OPTIONS_DEFINE=	DOCS

 pre-everything::
 	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
@@ -36,15 +40,18 @@
 	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:
 	${INSTALL} -d -g ${WWWGRP} -m 755 -o ${WWWOWN} ${WWWDIR}/
 	${CP} -R ${WRKSRC}/ ${WWWDIR}/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif

 post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}

 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/russian/wordpress/distinfo ./distinfo
--- /usr/ports/russian/wordpress/distinfo	2012-12-17 04:34:15.000000000 +0900
+++ ./distinfo	2013-01-23 17:58:07.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (wordpress-3.5-ru_RU.zip) = 850d56fee6cdd45c765d627d41df7c8b318470bebbb7b07a722ee7eb4d53cf21
-SIZE (wordpress-3.5-ru_RU.zip) = 6664495
+SHA256 (wordpress-3.5-ru_RU.tar.gz) = b8678ee3e91c471b520c543a639644a1ab7daa712a6e9a3539851d7c8f9d8e62
+SIZE (wordpress-3.5-ru_RU.tar.gz) = 6183385
diff -ruN --exclude=CVS /usr/ports/russian/wordpress/files/pkg-install.in ./files/pkg-install.in
--- /usr/ports/russian/wordpress/files/pkg-install.in	1970-01-01 09:00:00.000000000 +0900
+++ ./files/pkg-install.in	2012-05-23 21:22:28.000000000 +0900
@@ -0,0 +1,12 @@
+#!/bin/sh
+case $2 in
+	PRE-INSTALL)
+		;;
+	POST-INSTALL)
+		%%CHOWN%% -R %%WWWOWN%% %%WWWDIR%%/wp-content
+		%%FIND%% %%WWWDIR%% -type d -print | xargs %%CHGRP%% %%WWWGRP%%
+		%%FIND%% %%WWWDIR%% -type d -print | xargs %%CHMOD%% g+w
+		;;
+	*)
+	;;
+esac
diff -ruN --exclude=CVS /usr/ports/russian/wordpress/pkg-descr ./pkg-descr
--- /usr/ports/russian/wordpress/pkg-descr	2012-12-17 04:34:15.000000000 +0900
+++ ./pkg-descr	2012-01-06 16:32:54.000000000 +0900
@@ -4,4 +4,4 @@
 More simply, Wordpress is what you use when you want to work
 with your blogging software, not fight it.

-WWW: http://ru.wordpress.org/
+WWW:	http://ru.wordpress.org/
--- ru-wordpress-3.5.patch ends here ---


--- wordpress-3.5,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/wordpress/Makefile ./Makefile
--- /usr/ports/www/wordpress/Makefile	2012-12-13 05:56:27.000000000 +0900
+++ ./Makefile	2013-01-23 18:46:24.000000000 +0900
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wordpress
-# Date created:		2004-07-29
-# Whom:			Elvis Chiang <elvis@sslab.cs.ccu.edu.tw>
-#
-# $FreeBSD: ports/www/wordpress/Makefile,v 1.81 2012/12/12 20:56:27 svnexp Exp $
-#
+# Created by: Elvis Chiang <elvis@sslab.cs.ccu.edu.tw>
+# $FreeBSD: ports/www/wordpress/Makefile,v 1.79 2012/09/07 20:25:41 swills Exp $

 PORTNAME=	wordpress
 PORTVERSION=	3.5
@@ -14,6 +10,9 @@
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	A state-of-the-art semantic personal publishing platform

+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/license.txt
+
 CONFLICTS_INSTALL=	de-wordpress-3.* ja-wordpress-3.* ru-wordpress-3.*

 NO_BUILD=	yes
@@ -21,6 +20,9 @@
 WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}

+SUB_FILES=	pkg-message pkg-install
+SUB_LIST=	CHGRP="${CHGRP}" CHOWN="${CHOWN}" CHMOD="${CHMOD}"\
+		FIND="${FIND}" WWWGRP="${WWWGRP}" WWWOWN="${WWWOWN}"
 PLIST=		${WRKDIR}/pkg-plist
 PORTDOCS=	license.txt readme.html

@@ -49,6 +51,7 @@
 .endif

 post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}

 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/www/wordpress/files/pkg-install.in ./files/pkg-install.in
--- /usr/ports/www/wordpress/files/pkg-install.in	1970-01-01 09:00:00.000000000 +0900
+++ ./files/pkg-install.in	2012-05-23 22:33:52.000000000 +0900
@@ -0,0 +1,12 @@
+#!/bin/sh
+case $2 in
+	PRE-INSTALL)
+		;;
+	POST-INSTALL)
+		%%CHOWN%% -R %%WWWOWN%% %%WWWDIR%%/wp-content
+		%%FIND%% %%WWWDIR%% -type d -print | xargs %%CHGRP%% %%WWWGRP%%
+		%%FIND%% %%WWWDIR%% -type d -print | xargs %%CHMOD%% g+w
+		;;
+	*)
+	;;
+esac
diff -ruN --exclude=CVS /usr/ports/www/wordpress/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/www/wordpress/files/pkg-message.in	1970-01-01 09:00:00.000000000 +0900
+++ ./files/pkg-message.in	2012-05-23 22:33:52.000000000 +0900
@@ -0,0 +1,6 @@
+                  **** NOTE ****
+Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
+in %%WWWDIR%% and modify it to fit your MySQL.
+Maybe you need 'mysqladmin create wordpress' first.
+If you are upgrading from 1.x or 2.x to 3.x, please run
+http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 3.x
diff -ruN --exclude=CVS /usr/ports/www/wordpress/pkg-message ./pkg-message
--- /usr/ports/www/wordpress/pkg-message	2010-12-02 19:46:37.000000000 +0900
+++ ./pkg-message	1970-01-01 09:00:00.000000000 +0900
@@ -1,6 +0,0 @@
-                  **** NOTE ****
-Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
-in ${WWWDIR} and modify it to fit your MySQL.
-Maybe you need 'mysqladmin create wordpress' first.
-If you are upgrading from 1.x or 2.x to 3.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 3.x
--- wordpress-3.5,1.patch ends here ---


russian
When the next version comes out, you may change tarball.


>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:



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