> Please try this and give me feedback how it works...
> http://kuparinen.org/martti/tmp/mediawiki
A make update seems to work properly for me.
=> See attached logs
--- snip ---
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: Makefile
|===================================================================
|RCS file: Makefile,v
|retrieving revision 1.8
|diff -u -r1.8 Makefile
|--- Makefile 23 Jul 2009 17:34:09 -0000 1.8
|+++ Makefile 4 Aug 2009 05:54:04 -0000
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 19.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: PLIST
|===================================================================
|RCS file: PLIST,v
|retrieving revision 1.4
|diff -u -r1.4 PLIST
|--- PLIST 14 Jun 2009 22:00:26 -0000 1.4
|+++ PLIST 4 Aug 2009 05:54:05 -0000
--------------------------
Patching file PLIST using Plan A...
Hunk #1 succeeded at 1 with fuzz 1.
Hunk #2 succeeded at 40.
Hunk #3 succeeded at 53.
Hunk #4 succeeded at 85.
Hunk #5 succeeded at 99.
Hunk #6 succeeded at 131.
Hunk #7 succeeded at 143.
Hunk #8 succeeded at 161.
Hunk #9 succeeded at 181.
Hunk #10 succeeded at 191.
Hunk #11 succeeded at 207.
Hunk #12 succeeded at 224.
Hunk #13 succeeded at 234.
Hunk #14 succeeded at 244.
Hunk #15 succeeded at 263.
Hunk #16 succeeded at 288.
Hunk #17 succeeded at 311.
Hunk #18 succeeded at 338.
Hunk #19 succeeded at 346.
Hunk #20 succeeded at 378.
Hunk #21 succeeded at 404.
Hunk #22 succeeded at 458.
Hunk #23 succeeded at 479.
Hunk #24 succeeded at 555.
Hunk #25 succeeded at 588.
Hunk #26 succeeded at 604.
Hunk #27 succeeded at 645.
Hunk #28 succeeded at 659.
Hunk #29 succeeded at 671.
Hunk #30 succeeded at 699.
Hunk #31 succeeded at 708.
Hunk #32 succeeded at 727.
Hunk #33 succeeded at 750.
Hunk #34 succeeded at 797.
Hunk #35 succeeded at 834.
Hunk #36 succeeded at 855.
Hunk #37 succeeded at 864.
Hunk #38 succeeded at 879.
Hunk #39 succeeded at 896.
Hunk #40 succeeded at 913.
Hunk #41 succeeded at 939.
Hunk #42 succeeded at 974.
Hunk #43 succeeded at 1022.
Hunk #44 succeeded at 1047.
Hunk #45 succeeded at 1056.
Hunk #46 succeeded at 1090.
Hunk #47 succeeded at 1117.
Hunk #48 succeeded at 1132.
Hunk #49 succeeded at 1150.
Hunk #50 succeeded at 1198.
Hunk #51 succeeded at 1229.
Hunk #52 succeeded at 1285.
Hunk #53 succeeded at 1324.
Hunk #54 succeeded at 1375.
Hunk #55 succeeded at 1384.
Hunk #56 succeeded at 1456.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: distinfo
|===================================================================
|RCS file: distinfo,v
|retrieving revision 1.4
|diff -u -r1.4 distinfo
|--- distinfo 22 Feb 2009 11:58:57 -0000 1.4
|+++ distinfo 4 Aug 2009 05:54:05 -0000
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1 with fuzz 1.
done
-- mediawiki$ make update
if /usr/pkg/sbin/pkg_info -K /var/db/pkg -qe "mediawiki-[0-9]*"; then
/usr/pkg/sbin/pkg_info -K /var/db/pkg -qr "mediawiki-[0-9]*" >
/usr/pkgsrc/www/mediawiki/work/.DLIST;
else /usr/bin/touch /usr/pkgsrc/www/mediawiki/work/.DLIST; fi
===> Deinstalling for mediawiki-1.15.1
Running /usr/pkg/sbin/pkg_delete -K /var/db/pkg -r mediawiki-1.13.5
Executing `/bin/rmdir '/usr/pkg'/share/mediawiki/config 2>/dev/null || true'
Executing `/bin/rmdir '/usr/pkg'/share/mediawiki 2>/dev/null || true'
=> Bootstrap dependency digest>=20010302: found digest-20070803
=> Checksum SHA1 OK for mediawiki-1.15.1.tar.gz
=> Checksum RMD160 OK for mediawiki-1.15.1.tar.gz
===> Installing dependencies for mediawiki-1.15.1
==========================================================================
The supported build options for mediawiki are:
mysql mysql pgsql pgsql
The currently selected options are:
mysql
You can select which build options to use by setting PKG_DEFAULT_OPTIONS
or the following variable. Its current value is shown:
PKG_OPTIONS.mediawiki (not defined)
==========================================================================
==========================================================================
The following variables will affect the build process of this package,
mediawiki-1.15.1. Their current value is shown below:
* APACHE_GROUP = www
* APACHE_USER = www
* PKG_APACHE_DEFAULT = apache22
Based on these variables, the following variables have been set:
* APACHE_PKG_PREFIX = ap22
* PKG_APACHE = apache22
You may want to abort the process now with CTRL-C and change their value
before continuing. Be sure to run `/usr/bin/make clean' after
the changes.
==========================================================================
=> Build dependency perl>=5.0: found perl-5.10.0nb4
=> Build dependency apache>=2.2.9nb3: found apache-2.2.11nb6
=> Full dependency php5-mysql>=4.3.10: found php5-mysql-5.2.6
===> Overriding tools for mediawiki-1.15.1
===> Extracting for mediawiki-1.15.1
/bin/cp /usr/pkgsrc/www/mediawiki/files/mediawiki.conf
/usr/pkgsrc/www/mediawiki/work/mediawiki.conf
===> Patching for mediawiki-1.15.1
=> Fixing pathnames in configuration file.
=> Fixing path to perl
===> Creating toolchain wrappers for mediawiki-1.15.1
/bin/mkdir -p /usr/pkgsrc/www/mediawiki/work/.buildlink/bin && /bin/ln -fs
apr-1-config /usr/pkgsrc/www/mediawiki/work/.buildlink/bin/apr-config
/bin/mkdir -p /usr/pkgsrc/www/mediawiki/work/.buildlink/bin && /bin/ln -fs
apu-1-config /usr/pkgsrc/www/mediawiki/work/.buildlink/bin/apu-config
===> Installing for mediawiki-1.15.1
=> Creating installation directories
=> Running PRE-INSTALL script actions
cd /usr/pkgsrc/www/mediawiki/work/mediawiki-1.15.1 && /usr/bin/find . -type d
-exec /usr/bin/install -d -o root -g wheel -m 755 /usr/pkg/share/mediawiki/{}
\; -exec /usr/sbin/chown
www:www /usr/pkg/share/mediawiki/{} \;
cd /usr/pkgsrc/www/mediawiki/work/mediawiki-1.15.1 && /usr/bin/find . \! -type
d -exec /usr/bin/install -c -o root -g wheel -m 444 {}
/usr/pkg/share/mediawiki/{} \; -exec /usr/sbin/chown
www:www /usr/pkg/share/mediawiki/{} \;
/usr/bin/install -c -o root -g wheel -m 444
/usr/pkgsrc/www/mediawiki/work/mediawiki.conf
/usr/pkg/share/examples/mediawiki/mediawiki.conf
=> Automatic manual page handling
=> Running POST-INSTALL script actions
mediawiki-1.15.1: copying /usr/pkg/share/examples/mediawiki/mediawiki.conf to
/usr/pkg/etc/httpd/mediawiki.conf
===========================================================================
The following directories are used by mediawiki-1.15.1 and
have the wrong ownership and/or permissions:
/usr/pkg/etc/httpd (m=755, o=root, g=wheel)
===========================================================================
=> Please note the following:
===========================================================================
$NetBSD$
Add the following line to httpd.conf to make MediaWiki accessible
through your HTTP server:
Include /usr/pkg/etc/httpd/mediawiki.conf
Your MediaWiki is then accessible through:
http://www.example.com/mediawiki/
===========================================================================
=> Registering installation for mediawiki-1.15.1
mediawiki-1.15.1 requires installed package php5-mysql-5.2.6
if /usr/pkg/sbin/pkg_info -K /var/db/pkg -qe "mediawiki-[0-9]*"; then
/usr/pkg/sbin/pkg_info -K /var/db/pkg -qr "mediawiki-[0-9]*" >
/usr/pkgsrc/www/mediawiki/work/.DLIST;
else /usr/bin/touch /usr/pkgsrc/www/mediawiki/work/.DLIST; fi
===> Cleaning for mediawiki-1.15.1
--- snap ---
then i go into my different wiki's path(es):
--- snip ---
wiki/maintenance$ php update.php --aconf ../AdminSettings.php
MediaWiki 1.15.1 Updater
Going to run database updates for eicwiki-base_
Depending on the size of your database this may take a while!
Abort with control-c in the next five seconds...0
...have ipb_id field in ipblocks table.
...have ipb_expiry field in ipblocks table.
...already have interwiki table
...indexes seem up to 20031107 standards
...hitcounter table already exists.
...have rc_type field in recentchanges table.
...have user_real_name field in user table.
...querycache table already exists.
...objectcache table already exists.
...categorylinks table already exists.
Already have pagelinks; skipping old links table updates.
...il_from OK
...have rc_ip field in recentchanges table.
...image primary key already set.
...have rc_id field in recentchanges table.
...have rc_patrolled field in recentchanges table.
...logging table already exists.
...have user_token field in user table.
The watchlist table is already set up for email notification.
...watchlist talk page rows already present
...user table does not contain old email authentication field.
...page table already exists.
...have log_params field in logging table.
logging table has correct log_title encoding.
...have ar_rev_id field in archive table.
...have page_len field in page table.
revision timestamp indexes already up to 2005-03-13
...rev_text_id already in place.
...have rev_deleted field in revision table.
...have img_width field in image table.
...have img_metadata field in image table.
...have user_email_token field in user table.
...have ar_text_id field in archive table.
...page_namespace is already a full int (int(11)).
...ar_namespace is already a full int (int(11)).
...rc_namespace is already a full int (int(11)).
...wl_namespace is already a full int (int(11)).
...qc_namespace is already a full int (int(11)).
...log_namespace is already a full int (int(11)).
...have img_media_type field in image table.
...already have pagelinks table.
No img_type field in image table; Good.
Already have unique user_name index.
...user_groups table already exists.
...user_groups is in current format.
...have ss_total_pages field in site_stats table.
...user_newtalk table already exists.
...transcache table already exists.
...have iw_trans field in interwiki table.
...trackbacks table already exists.
...wl_notificationtimestamp is already nullable.
...timestamp key on logging already exists.
...have ipb_range_start field in ipblocks table.
Setting page_random to a random value on rows where it equals 0...changed 0 rows
...have user_registration field in user table.
...templatelinks table already exists
...externallinks table already exists.
...job table already exists.
...have ss_images field in site_stats table.
...langlinks table already exists.
...querycache_info table already exists.
...filearchive table already exists.
...have ipb_anon_only field in ipblocks table.
Checking for additional recent changes indices...
...index `rc_ns_usertext` seems ok.
...index `rc_user_text` seems ok.
...have user_newpass_time field in user table.
...redirect table already exists.
...querycachetwo table already exists.
...have ipb_enable_autoblock field in ipblocks table.
Checking for backlinking indices...
Checking if pagelinks index pl_namespace includes field pl_from...
...index pl_namespace on table pagelinks seems to be ok
Checking if templatelinks index tl_namespace includes field tl_from...
...index tl_namespace on table templatelinks seems to be ok
Checking if imagelinks index il_to includes field il_from...
...index il_to on table imagelinks seems to be ok
...have rc_old_len field in recentchanges table.
...have user_editcount field in user table.
...page_restrictions table already exists.
...have log_id field in logging table.
...have rev_parent_id field in revision table.
...have pr_id field in page_restrictions table.
...have rev_len field in revision table.
...have rc_deleted field in recentchanges table.
...have log_deleted field in logging table.
...have ar_deleted field in archive table.
...have ipb_deleted field in ipblocks table.
...have fa_deleted field in filearchive table.
...have ar_len field in archive table.
...have ipb_block_email field in ipblocks table.
Checking for categorylinks indices...
Checking if categorylinks index cl_sortkey includes field cl_from...
...index cl_sortkey on table categorylinks seems to be ok
...have oi_metadata field in oldimage table.
...usertext,timestamp key on archive already exists.
...usertext,timestamp key on image already exists.
...usertext,timestamp key on oldimage already exists.
...have ar_page_id field in archive table.
...have img_sha1 field in image table.
...protected_titles table already exists.
...have ipb_by_text field in ipblocks table.
...page_props table already exists.
...updatelog table already exists.
...category table already exists.
...category table already populated.
...have ar_parent_id field in archive table.
...have user_last_timestamp field in user_newtalk table.
...rev_parent_id column already populated.
protected_titles table has correct pt_title encoding.
Checking filearchive indices...
...have ss_active_users field in site_stats table.
...ss_active_users user count set...
...have ipb_allow_usertalk field in ipblocks table.
Making pl_namespace, tl_namespace and il_to indices UNIQUE... ok
Creating change_tag table...ok
...tag_summary table already exists.
...valid_tag table already exists.
Deleting old default messages (this may take a long time!)...Done
Checking site_stats row...ok.
Purging caches...done.
Done.
--- snap ---
many thanks and good luck!
cheers,
Niels.
---
Niels Dettenbach
---
Syndicat IT&Internet
http://www.syndicat.com
T.-Muentzer.-Str. 2, 37308 Heilbad Heiligenstadt - DE
---
Kryptoinfo:
PGP public key ID 651CA20D
Fingerprint: 55E0 4DCD B04C 4A49 1586 88AE 54DC 4465 651C A20D
https://syndicat.com/pub_key.asc
---
Attachment:
signature.asc
Description: This is a digitally signed message part.