svn commit: r338371 - in head/www: moodle24 moodle25

[Andrej Zverev]

Why so cryptic style? You can simple do it like this.

Index: moodle24/Makefile
===================================================================
--- moodle24/Makefile   (revision 338371)
+++ moodle24/Makefile   (working copy)
@@ -6,6 +6,7 @@
 CATEGORIES=    www
 MASTER_SITES=  SF/moodle/Moodle/stable24/
 EXTRACT_SUFX=  .tgz
+PKGNAMESUFFIX= 24
 MAINTAINER=    wen at FreeBSD.org
 COMMENT=       Course management system based on social constructionism
@@ -14,7 +15,6 @@
 RUN_DEPENDS=
${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 CONFLICTS=     moodle-1.*.* moodle-2.5.*
-PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}
 USE_PHP=       session gd pcre mbstring iconv tokenizer curl xml xmlrpc
ctype \
                soap openssl simplexml spl dom json zip zlib hash
Index: moodle25/Makefile
===================================================================
--- moodle25/Makefile   (revision 338371)
+++ moodle25/Makefile   (working copy)
@@ -6,6 +6,7 @@
 CATEGORIES=    www
 MASTER_SITES=  SF/moodle/Moodle/stable25/
 EXTRACT_SUFX=  .tgz
+PKGNAMESUFFIX= 25
 MAINTAINER=    wen at FreeBSD.org
 COMMENT=       Course management system based on social constructionism
@@ -14,7 +15,6 @@
 RUN_DEPENDS=
${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 CONFLICTS=     moodle-1.*.* moodle-2.4.*
-PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}
 USE_PHP=       session gd pcre mbstring iconv tokenizer curl xml xmlrpc
ctype \
                soap openssl simplexml spl dom json zip zlib hash


On Wed, Jan 1, 2014 at 12:12 PM, Jason Helfman <jgh at freebsd.org> wrote:

> Author: jgh
> Date: Wed Jan  1 08:12:40 2014
> New Revision: 338371
> URL: http://svnweb.freebsd.org/changeset/ports/338371
>
> Log:
>   - fix pkgname collisions
>
>   Submitted by: jgh@
>   Approved by:  wen@
>
> Modified:
>   head/www/moodle24/Makefile
>   head/www/moodle25/Makefile
>
> Modified: head/www/moodle24/Makefile
>
> ==============================================================================
> --- head/www/moodle24/Makefile  Wed Jan  1 07:59:26 2014        (r338370)
> +++ head/www/moodle24/Makefile  Wed Jan  1 08:12:40 2014        (r338371)
> @@ -14,7 +14,7 @@ BUILD_DEPENDS=        ${PHPBASE}/lib/php/${PHP_
>  RUN_DEPENDS=
> ${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
>
>  CONFLICTS=     moodle-1.*.* moodle-2.5.*
> -LATEST_LINK=   moodle24
> +PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}
>
>  USE_PHP=       session gd pcre mbstring iconv tokenizer curl xml xmlrpc
> ctype \
>                 soap openssl simplexml spl dom json zip zlib hash
>
> Modified: head/www/moodle25/Makefile
>
> ==============================================================================
> --- head/www/moodle25/Makefile  Wed Jan  1 07:59:26 2014        (r338370)
> +++ head/www/moodle25/Makefile  Wed Jan  1 08:12:40 2014        (r338371)
> @@ -14,7 +14,7 @@ BUILD_DEPENDS=        ${PHPBASE}/lib/php/${PHP_
>  RUN_DEPENDS=
> ${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
>
>  CONFLICTS=     moodle-1.*.* moodle-2.4.*
> -LATEST_LINK=   moodle25
> +PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}
>
>  USE_PHP=       session gd pcre mbstring iconv tokenizer curl xml xmlrpc
> ctype \
>                 soap openssl simplexml spl dom json zip zlib hash
>