Re: [UPDATE] www/wordpress to version 3.0
On Sun, Jul 11, 2010 at 11:11:39AM +0200, Matthias Kilian wrote:
On Thu, Jul 08, 2010 at 10:59:38AM -0400, Mike Erdely wrote:
Here's an updated diff including removal of wordpress-mu, addition of
quirk and other advice from Kili.
ok?
This part was probably against www/wordpress/Makefile:
I don't understand this comment.
Index: Makefile
===
RCS file: /cvs/ports/www/wordpress/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile15 Apr 2010 14:29:18 - 1.26
+++ Makefile8 Jul 2010 14:57:36 -
@@ -2,8 +2,7 @@
COMMENT = standard compliant weblog
-DISTNAME = wordpress-2.9.2
-PKGNAME = ${DISTNAME}p0
+DISTNAME = wordpress-3.0
CATEGORIES = www
HOMEPAGE = http://wordpress.org/
Otherwise ok, but note that I'm not using wordpress nor wordpress-mu
for real on OpenBSD (or anywhere else); we just have some customers
using it, and they did use *recent* versions of wordpress-mu.
So no objections to removing wordpress-mu?
Ciao,
Kili
I'll commit the diff tomorrow if there are no objections.
-ME
Re: [UPDATE] www/wordpress to version 3.0
On Tue, Jul 13, 2010 at 03:14:15PM -0400, Mike Erdely wrote: This part was probably against www/wordpress/Makefile: I don't understand this comment. Your diff was relative to /usr/ports, but the www/wordpress/Makefile part was relative to /usr/ports/www/wordpress: $ grep -E '^(Index|---|\+\+\+)' wordpress.diff Index: devel/quirks/Makefile --- devel/quirks/Makefile 29 Jun 2010 01:13:33 - 1.16 +++ devel/quirks/Makefile 8 Jul 2010 14:54:48 - Index: devel/quirks/files/Quirks.pm --- devel/quirks/files/Quirks.pm29 Jun 2010 01:13:33 - 1.20 +++ devel/quirks/files/Quirks.pm8 Jul 2010 14:29:18 - Index: Makefile --- Makefile15 Apr 2010 14:29:18 - 1.26 +++ Makefile8 Jul 2010 14:57:36 - Index: www/wordpress/distinfo --- www/wordpress/distinfo 22 Mar 2010 02:00:49 - 1.24 +++ www/wordpress/distinfo 8 Jul 2010 14:19:59 - Index: www/wordpress/pkg/PLIST --- www/wordpress/pkg/PLIST 8 Jan 2010 15:30:53 - 1.13 +++ www/wordpress/pkg/PLIST 8 Jul 2010 14:32:57 - Index: www/wordpress-mu/Makefile --- www/wordpress-mu/Makefile 26 Jul 2009 20:09:18 - 1.4 +++ /dev/null 1 Jan 1970 00:00:00 - Index: www/wordpress-mu/distinfo --- www/wordpress-mu/distinfo 15 Feb 2008 15:13:14 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - Index: www/wordpress-mu/pkg/DESCR --- www/wordpress-mu/pkg/DESCR 29 Oct 2007 07:46:33 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - Index: www/wordpress-mu/pkg/MESSAGE --- www/wordpress-mu/pkg/MESSAGE29 Oct 2007 07:46:33 - 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 - Index: www/wordpress-mu/pkg/PLIST --- www/wordpress-mu/pkg/PLIST 15 Feb 2008 15:13:14 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - I'll commit the diff tomorrow if there are no objections. The wordpress-mu removal should probably be done slowly, file by file -- it deserves a painful death (just kidding). Ciao, Kili -- Our biggest mistake: Using the scary term monad rather than warm fuzzy thing -- Simon Peyton Jones, POPL 2003
Re: [UPDATE] www/wordpress to version 3.0
On Thu, Jul 08, 2010 at 10:59:38AM -0400, Mike Erdely wrote:
Here's an updated diff including removal of wordpress-mu, addition of
quirk and other advice from Kili.
ok?
This part was probably against www/wordpress/Makefile:
Index: Makefile
===
RCS file: /cvs/ports/www/wordpress/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 15 Apr 2010 14:29:18 - 1.26
+++ Makefile 8 Jul 2010 14:57:36 -
@@ -2,8 +2,7 @@
COMMENT =standard compliant weblog
-DISTNAME = wordpress-2.9.2
-PKGNAME =${DISTNAME}p0
+DISTNAME = wordpress-3.0
CATEGORIES = www
HOMEPAGE = http://wordpress.org/
Otherwise ok, but note that I'm not using wordpress nor wordpress-mu
for real on OpenBSD (or anywhere else); we just have some customers
using it, and they did use *recent* versions of wordpress-mu.
Ciao,
Kili
Re: [UPDATE] www/wordpress to version 3.0
Hi,
On Fri, Jul 02, 2010 at 07:27:18PM +0200, Jiri B. wrote:
update for WordPress, wordpress now conflicts with wordpress-mu as the
latter has been merged into WordPress. Hope I did it correctly :)
[...]
RCS file: /cvs/ports/www/wordpress/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 20:28:02 - 1.2
+++ pkg/MESSAGE 2 Jul 2010 17:23:33 -
@@ -1,3 +1,7 @@
+Important notice:
+WordPress and WordPress MU have merged with 3.0 version!
+
+Install notice:
The WordPress has been installed into
${INSTDIR}
I don't think this is needed. When I did some tests for a customer
updating wpmu (2.9.2) to wp-3.0 (some beta), a line defining
WP_ALLOW_MULTISITE has been automatically added to wp-config.php,
IIRC. Apart from this,
However, I don't know wether it's even possible to update the totally
outdated wordpress-mu in our tree to some recent version (be it
wpmu-2.9.2 or wordpress-3.0 with multisite support).
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/wordpress/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 8 Jan 2010 15:30:53 - 1.13
+++ pkg/PLIST 2 Jul 2010 17:23:33 -
@@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.13 2010/01/08 15:30:53 kevlo Exp $
+...@conflict wordpress-mu-*
You will also need to add @pkgpath www/wordpress-mu. Additionally,
www/wordpress-mu should be removed from the tree (it's rotten old
anyway), and we will have to add an entry for wordpress-mu -
wordpress to devel/quirks (this can be done by however will commit
the wordpress update).
Ciao,
Kili
Re: [UPDATE] www/wordpress to version 3.0
On Fri, 2 Jul 2010 20:02:17 +0200
Matthias Kilian k...@outback.escape.de wrote:
However, I don't know wether it's even possible to update the totally
outdated wordpress-mu in our tree to some recent version (be it
wpmu-2.9.2 or wordpress-3.0 with multisite support).
There's a link how to migrate from wordpress-mu to wordpress 3.0:
http://developersmind.com/2010/06/17/upgrading-wordpress-mu-2-9-2-to-wordpress-3-0/
Additionally,
www/wordpress-mu should be removed from the tree (it's rotten old
anyway), and we will have to add an entry for wordpress-mu -
wordpress to devel/quirks (this can be done by however will commit
the wordpress update).
OK, conflict is not needed. Here is updated patch.
Yes, if v3.0 will go into the tree then wordpress-mu should be added to
devel/quirks, I think.
jirib
Index: Makefile
===
RCS file: /cvs/ports/www/wordpress/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile15 Apr 2010 14:29:18 - 1.26
+++ Makefile2 Jul 2010 19:15:11 -
@@ -2,8 +2,8 @@
COMMENT = standard compliant weblog
-DISTNAME = wordpress-2.9.2
-PKGNAME = ${DISTNAME}p0
+DISTNAME = wordpress-3.0
+PKGNAME = ${DISTNAME}
CATEGORIES = www
HOMEPAGE = http://wordpress.org/
Index: distinfo
===
RCS file: /cvs/ports/www/wordpress/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo22 Mar 2010 02:00:49 - 1.24
+++ distinfo2 Jul 2010 19:15:11 -
@@ -1,5 +1,5 @@
-MD5 (wordpress-2.9.2.tar.gz) = YCP+ZwFHbIFSvaXUxid8aQ==
-RMD160 (wordpress-2.9.2.tar.gz) = rqZUKcnuZvoSNzGVORGadhupPS0=
-SHA1 (wordpress-2.9.2.tar.gz) = xLxPpuSxxjHTcqkwhShzMDcIqIE=
-SHA256 (wordpress-2.9.2.tar.gz) = c0Jif0o9ykSIbFrKaDTMiGcdvTqidgGC0vy5ozCAfOE=
-SIZE (wordpress-2.9.2.tar.gz) = 2229832
+MD5 (wordpress-3.0.tar.gz) = y6FbNE1TZUJVOUdp5Mhlrw==
+RMD160 (wordpress-3.0.tar.gz) = s/S198dQib1NEuaMdZkt5S5zdJo=
+SHA1 (wordpress-3.0.tar.gz) = 1iUc1vmxYBzGHLQkoX4d1w8lotE=
+SHA256 (wordpress-3.0.tar.gz) = c0FO/6PdEKhWsOjppHJukiiPrX5DcjEGcWty3l8+2Rw=
+SIZE (wordpress-3.0.tar.gz) = 2683109
Index: pkg/MESSAGE
===
RCS file: /cvs/ports/www/wordpress/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 20:28:02 - 1.2
+++ pkg/MESSAGE 2 Jul 2010 19:15:11 -
@@ -1,3 +1,7 @@
+Important notice:
+WordPress and WordPress MU have merged with 3.0 version!
+
+Install notice:
The WordPress has been installed into
${INSTDIR}
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/wordpress/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 8 Jan 2010 15:30:53 - 1.13
+++ pkg/PLIST 2 Jul 2010 19:15:11 -
@@ -1,8 +1,9 @@
-...@comment $OpenBSD: PLIST,v 1.13 2010/01/08 15:30:53 kevlo Exp $
+...@comment $OpenBSD$
wordpress/
wordpress/index.php
wordpress/license.txt
wordpress/readme.html
+wordpress/wp-activate.php
wordpress/wp-admin/
wordpress/wp-admin/admin-ajax.php
wordpress/wp-admin/admin-footer.php
@@ -11,59 +12,79 @@ wordpress/wp-admin/admin-header.php
wordpress/wp-admin/admin-post.php
wordpress/wp-admin/admin.php
wordpress/wp-admin/async-upload.php
-wordpress/wp-admin/categories.php
wordpress/wp-admin/comment.php
wordpress/wp-admin/css/
wordpress/wp-admin/css/colors-classic-rtl.css
+wordpress/wp-admin/css/colors-classic-rtl.dev.css
wordpress/wp-admin/css/colors-classic.css
wordpress/wp-admin/css/colors-classic.dev.css
wordpress/wp-admin/css/colors-fresh-rtl.css
+wordpress/wp-admin/css/colors-fresh-rtl.dev.css
wordpress/wp-admin/css/colors-fresh.css
wordpress/wp-admin/css/colors-fresh.dev.css
wordpress/wp-admin/css/dashboard-rtl.css
+wordpress/wp-admin/css/dashboard-rtl.dev.css
wordpress/wp-admin/css/dashboard.css
wordpress/wp-admin/css/dashboard.dev.css
wordpress/wp-admin/css/farbtastic-rtl.css
wordpress/wp-admin/css/farbtastic.css
wordpress/wp-admin/css/global-rtl.css
+wordpress/wp-admin/css/global-rtl.dev.css
wordpress/wp-admin/css/global.css
wordpress/wp-admin/css/global.dev.css
wordpress/wp-admin/css/ie-rtl.css
+wordpress/wp-admin/css/ie-rtl.dev.css
wordpress/wp-admin/css/ie.css
+wordpress/wp-admin/css/ie.dev.css
wordpress/wp-admin/css/install-rtl.css
+wordpress/wp-admin/css/install-rtl.dev.css
wordpress/wp-admin/css/install.css
wordpress/wp-admin/css/install.dev.css
wordpress/wp-admin/css/login-rtl.css
+wordpress/wp-admin/css/login-rtl.dev.css
wordpress/wp-admin/css/login.css
wordpress/wp-admin/css/login.dev.css
wordpress/wp-admin/css/media-rtl.css
+wordpress/wp-admin/css/media-rtl.dev.css
wordpress/wp-admin/css/media.css
wordpress/wp-admin/css/media.dev.css
+wordpress/wp-admin/css/ms.css
+wordpress/wp-admin/css/ms.dev.css
+wordpress/wp-admin/css/nav-menu-rtl.css
Re: [UPDATE] www/wordpress to version 3.0
On Fri, Jul 02, 2010 at 09:19:36PM +0200, Jiri B. wrote:
-DISTNAME = wordpress-2.9.2
-PKGNAME =${DISTNAME}p0
+DISTNAME = wordpress-3.0
+PKGNAME =${DISTNAME}
Think i've said that dozens of times... but this last line is NOT
NEEDED.
Landry
Re: [UPDATE] www/wordpress to version 3.0
On 2010/07/02 23:17, Landry Breuil wrote:
On Fri, Jul 02, 2010 at 09:19:36PM +0200, Jiri B. wrote:
-DISTNAME = wordpress-2.9.2
-PKGNAME = ${DISTNAME}p0
+DISTNAME = wordpress-3.0
+PKGNAME = ${DISTNAME}
Think i've said that dozens of times... but this last line is NOT
NEEDED.
it doesn't hurt though, and it's better to add some not-needed things
occasionally than for someone to remove a PKGNAME-main because they
think *that* isn't needed ;)
.
Re: [UPDATE] www/wordpress to version 3.0
On Fri, 2 Jul 2010 23:17:09 +0200
Landry Breuil lan...@rhaalovely.net wrote:
On Fri, Jul 02, 2010 at 09:19:36PM +0200, Jiri B. wrote:
-DISTNAME = wordpress-2.9.2
-PKGNAME = ${DISTNAME}p0
+DISTNAME = wordpress-3.0
+PKGNAME = ${DISTNAME}
Think i've said that dozens of times... but this last line is NOT
NEEDED.
It was cut paste from the original one :)
jirib
