Date: Wed, 1 Jan 2014 12:42:29 +0400 From: Andrej Zverev <az@freebsd.org> To: Jason Helfman <jgh@freebsd.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r338371 - in head/www: moodle24 moodle25 Message-ID: <CAD5bB%2BiXUToL-jNg3W9n62ip8wTYwGvuYM9eynr4sxKK_UUe_A@mail.gmail.com> In-Reply-To: <201401010812.s018CedY038638@svn.freebsd.org> References: <201401010812.s018CedY038638@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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@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@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@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
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAD5bB%2BiXUToL-jNg3W9n62ip8wTYwGvuYM9eynr4sxKK_UUe_A>