2012/5/2 Okan Demirmen <[email protected]>

> On Mon 2012.04.30 at 20:18 +0800, wen heping wrote:
> > Hi,
> >
> >    Here is an update of www/mediawiki to 1.18.3.
> >    It build well on i386.
> >    OK? Comments?
>
> Hi,
>
> May I additionally suggest the following changes?
>  - replace MESSAGE with README
>  - chmod/find should happen in INSTDIR, as opposed to PREFIX
>

I agree with you.
Thank you !

wen



>
> Cheers,
> Okan
>
> Index: Makefile
> ===================================================================
> RCS file: /home/open/anoncvs/cvs/ports/www/mediawiki/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile    23 Mar 2012 12:59:58 -0000      1.35
> +++ Makefile    2 May 2012 15:26:00 -0000
> @@ -2,7 +2,7 @@
>
>  COMMENT =      web-based collaborative editing environment
>
> -DISTNAME =     mediawiki-1.18.2
> +DISTNAME =     mediawiki-1.18.3
>  CATEGORIES =   www
>
>  HOMEPAGE =     http://www.mediawiki.org/
> @@ -32,7 +32,7 @@ RUN_DEPENDS=  lang/php/${MODPHP_VERSION},
>  do-install:
>        @${INSTALL_DATA_DIR} ${INSTDIR}
>        @cd ${WRKSRC} && pax -rw * ${INSTDIR}
> -       @find ${PREFIX} -name '.cvsignore' -or -name \*.orig -exec rm {} \;
> -       @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}
> +       @find ${INSTDIR} \( -name '.cvsignore' -or -name \*.orig \) -exec
> rm -f {} +
> +       @chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
>
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/open/anoncvs/cvs/ports/www/mediawiki/distinfo,v
> retrieving revision 1.21
> diff -u -p -r1.21 distinfo
> --- distinfo    23 Mar 2012 12:59:58 -0000      1.21
> +++ distinfo    2 May 2012 15:10:45 -0000
> @@ -1,5 +1,5 @@
> -MD5 (mediawiki-1.18.2.tar.gz) = Z8PHQsYxDO7xasWuXLX7/w==
> -RMD160 (mediawiki-1.18.2.tar.gz) = KtJ4I20LY2SJ3dDuB3TTRhNfUAk=
> -SHA1 (mediawiki-1.18.2.tar.gz) = 7a+GEE91QqCNbOOUc83valsB/KQ=
> -SHA256 (mediawiki-1.18.2.tar.gz) =
> giKLuF9K4M+qXisbW+V2AdhuW/4vPTl6a9DC0wIczO8=
> -SIZE (mediawiki-1.18.2.tar.gz) = 17320421
> +MD5 (mediawiki-1.18.3.tar.gz) = ldcwnrl+p2lvCRC0j62bDA==
> +RMD160 (mediawiki-1.18.3.tar.gz) = caIuTwFkWaCh8hWxaZ497R3zzLM=
> +SHA1 (mediawiki-1.18.3.tar.gz) = 5STgjiSgEp5Z3EHvSC31cFSBxfk=
> +SHA256 (mediawiki-1.18.3.tar.gz) =
> QxnzcoKtZN38pT7K522nh2MPHNDlrUONAoVR+xdC6zk=
> +SIZE (mediawiki-1.18.3.tar.gz) = 17376442
> Index: pkg/MESSAGE
> ===================================================================
> RCS file: pkg/MESSAGE
> diff -N pkg/MESSAGE
> --- pkg/MESSAGE 4 Dec 2009 11:06:29 -0000       1.2
> +++ /dev/null   1 Jan 1970 00:00:00 -0000
> @@ -1,8 +0,0 @@
> -The MediaWiki has been installed into ${INSTDIR}
> -
> -You should point this to the DocumentRoot of your web server:
> -   # ln -s ../mediawiki /var/www/htdocs/mediawiki
> -(make sure you use a relative symlink since Apache is chrooted)
> -
> -You can ensure you have a working install by accessing:
> -http://<localhost>/mediawiki/
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/open/anoncvs/cvs/ports/www/mediawiki/pkg/PLIST,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST
> --- pkg/PLIST   23 Mar 2012 12:59:58 -0000      1.16
> +++ pkg/PLIST   2 May 2012 15:21:02 -0000
> @@ -58,6 +58,9 @@ mediawiki/docs/title.txt
>  mediawiki/docs/upload.txt
>  mediawiki/extensions/
>  mediawiki/extensions/ConfirmEdit/
> +mediawiki/extensions/ConfirmEdit/Asirra.class.php
> +mediawiki/extensions/ConfirmEdit/Asirra.i18n.php
> +mediawiki/extensions/ConfirmEdit/Asirra.php
>  mediawiki/extensions/ConfirmEdit/Captcha.php
>  mediawiki/extensions/ConfirmEdit/CaptchaStore.php
>  mediawiki/extensions/ConfirmEdit/ConfirmEdit.alias.php
> @@ -74,9 +77,11 @@ mediawiki/extensions/ConfirmEdit/QuestyC
>  mediawiki/extensions/ConfirmEdit/QuestyCaptcha.i18n.php
>  mediawiki/extensions/ConfirmEdit/QuestyCaptcha.php
>  mediawiki/extensions/ConfirmEdit/README
> +mediawiki/extensions/ConfirmEdit/ReCaptcha.class.php
>  mediawiki/extensions/ConfirmEdit/ReCaptcha.i18n.php
>  mediawiki/extensions/ConfirmEdit/ReCaptcha.php
>  mediawiki/extensions/ConfirmEdit/captcha.py
> +mediawiki/extensions/ConfirmEdit/ext.confirmedit.asirra.js
>  mediawiki/extensions/ConfirmEdit/recaptchalib.php
>  mediawiki/extensions/Gadgets/
>  mediawiki/extensions/Gadgets/ApiQueryGadgetCategories.php
> @@ -95,6 +100,7 @@ mediawiki/extensions/Nuke/Nuke.i18n.php
>  mediawiki/extensions/Nuke/Nuke.php
>  mediawiki/extensions/Nuke/Nuke_body.php
>  mediawiki/extensions/Nuke/SpecialNuke.php
> +mediawiki/extensions/Nuke/ext.nuke.js
>  mediawiki/extensions/ParserFunctions/
>  mediawiki/extensions/ParserFunctions/COPYING
>  mediawiki/extensions/ParserFunctions/Convert.php
> @@ -109,7 +115,6 @@ mediawiki/extensions/ParserFunctions/exp
>  mediawiki/extensions/ParserFunctions/funcsParserTests.txt
>  mediawiki/extensions/ParserFunctions/stringFunctionTests.txt
>  mediawiki/extensions/ParserFunctions/testExpr.php
> -mediawiki/extensions/README
>  mediawiki/extensions/Renameuser/
>  mediawiki/extensions/Renameuser/RenameUserJob.php
>  mediawiki/extensions/Renameuser/Renameuser.alias.php
> @@ -2348,10 +2353,6 @@ mediawiki/tests/
>  mediawiki/tests/.htaccess
>  mediawiki/tests/RunSeleniumTests.php
>  mediawiki/tests/TestsAutoLoader.php
> -mediawiki/tests/jasmine/
> -mediawiki/tests/jasmine/lib/
> -mediawiki/tests/jasmine/spec/
> -mediawiki/tests/jasmine/spec_makers/
>  mediawiki/tests/parser/
>  mediawiki/tests/parser/extraParserTests.txt
>  mediawiki/tests/parser/parserTest.inc
> @@ -2683,3 +2684,5 @@ mediawiki/thumb.php5
>  mediawiki/trackback.php
>  mediawiki/trackback.php5
>  mediawiki/wiki.phtml
> +@cwd ${LOCALBASE}/share/doc/pkg-readmes
> +${FULLPKGNAME}
> Index: pkg/README
> ===================================================================
> RCS file: pkg/README
> diff -N pkg/README
> --- /dev/null   1 Jan 1970 00:00:00 -0000
> +++ pkg/README  2 May 2012 15:14:38 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> ++-----------------------------------------------------------------------
> +| Running ${FULLPKGNAME} on OpenBSD
> ++-----------------------------------------------------------------------
> +
> +Setup with httpd from OpenBSD base system
> +=========================================
> +The MediaWiki has been installed into ${INSTDIR}
> +
> +You should point this to the DocumentRoot of your web server:
> +   # ln -s ../mediawiki /var/www/htdocs/mediawiki
> +(make sure you use a relative symlink since Apache is chrooted)
> +
> +You can ensure you have a working install by accessing:
> +http://<localhost>/mediawiki/
>

Reply via email to