diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2013-12-05 11:10:49 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2013-12-05 11:10:49 +0000 |
| commit | bcc4614ebb8e7cedfc57740463f77b8e5a210499 (patch) | |
| tree | dbba8f7c619a6f7db5c86ae59117cfcf6e8fe57e | |
| parent | f5626c92ccbdd28dc45d72d67ddeb50615fd1b30 (diff) | |
| download | ports-bcc4614ebb8e7cedfc57740463f77b8e5a210499.tar.gz ports-bcc4614ebb8e7cedfc57740463f77b8e5a210499.zip | |
Notes
28 files changed, 47 insertions, 54 deletions
diff --git a/databases/pgpool-II-22/Makefile b/databases/pgpool-II-22/Makefile index a2ba89463959..c11bb06bd6cb 100644 --- a/databases/pgpool-II-22/Makefile +++ b/databases/pgpool-II-22/Makefile @@ -6,6 +6,7 @@ PORTVERSION= 2.2.6 PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/2478/ +PKGNAMESUFFIX= 22 MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL @@ -14,9 +15,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_PGSQL= yes USE_LDCONFIG= yes -NO_LATEST_LINK= yes -CONFLICTS= pgpool-3.* pgpool-II-* +CONFLICTS= pgpool-3.* pgpool-II-3.* pgpool-II-23-* pgpool-II-30-* USE_RC_SUBR= pgpool PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp diff --git a/databases/pgpool-II-23/Makefile b/databases/pgpool-II-23/Makefile index c0f08f2c1b82..06544690256a 100644 --- a/databases/pgpool-II-23/Makefile +++ b/databases/pgpool-II-23/Makefile @@ -5,6 +5,7 @@ PORTNAME= pgpool-II PORTVERSION= 2.3.3 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/2664/ +PKGNAMESUFFIX= 23 MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL @@ -13,9 +14,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_PGSQL= yes USE_LDCONFIG= yes -NO_LATEST_LINK= yes -CONFLICTS= pgpool-3.* pgpool-II-* +CONFLICTS= pgpool-3.* pgpool-II-3.* pgpool-II-22-* pgpool-II-30-* USE_RC_SUBR= pgpool PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp diff --git a/databases/pgpool-II-30/Makefile b/databases/pgpool-II-30/Makefile index 928c3bdc87f0..31b3f347e049 100644 --- a/databases/pgpool-II-30/Makefile +++ b/databases/pgpool-II-30/Makefile @@ -5,6 +5,7 @@ PORTNAME= pgpool-II PORTVERSION= 3.0.4 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/3076/ +PKGNAMESUFFIX= 30 MAINTAINER= kuriyama@FreeBSD.org COMMENT= A connection pool server for PostgreSQL @@ -15,9 +16,8 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_PGSQL= yes USE_LDCONFIG= yes -NO_LATEST_LINK= yes -CONFLICTS= pgpool-3.* pgpool-II-2.* pgpool-II-3.1.* +CONFLICTS= pgpool-3.* pgpool-II-3.* pgpool-II-22-* pgpool-II-23-* USE_RC_SUBR= pgpool PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile index 8e8e98e1990b..958d0219e741 100644 --- a/databases/pgpool-II/Makefile +++ b/databases/pgpool-II/Makefile @@ -19,7 +19,7 @@ USE_LDCONFIG= yes USE_OPENSSL= yes CONFIGURE_ARGS= --with-openssl -CONFLICTS= pgpool-3.* pgpool-II-2.* pgpool-II-3.0.* +CONFLICTS= pgpool-3.* pgpool-II-22-* pgpool-II-23-* pgpool-II-23-* USE_RC_SUBR= pgpool PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index a6131d741cf8..687c4052c6ba 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libxml2.so:${PORTSDIR}/textproc/libxml2 \ libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango -CONFLICTS= rrdtool-1.0* rrdtool-1.2* +CONFLICTS= rrdtool10-* rrdtool12-* USE_RC_SUBR= rrdcached USE_AUTOTOOLS= libtool diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile index 6d221967a76b..284c0df77090 100644 --- a/databases/rrdtool10/Makefile +++ b/databases/rrdtool10/Makefile @@ -6,14 +6,14 @@ PORTVERSION= 1.0.50 PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/ +PKGNAMESUFFIX= 10 MAINTAINER= lth@FreeBSD.org COMMENT= Round Robin Database Tools MAKE_ENV= PERL=${PERL} -CONFLICTS= rrdtool-1.2* -LATEST_LINK= rrdtool10 +CONFLICTS= rrdtool12-* rrdtool-1.* USES= pkgconfig perl5 USE_AUTOTOOLS= libtool diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile index 528a85ce9096..52b4fe2832aa 100644 --- a/databases/rrdtool12/Makefile +++ b/databases/rrdtool12/Makefile @@ -6,6 +6,7 @@ PORTVERSION= 1.2.30 PORTREVISION= 2 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ +PKGNAMESUFFIX= 12 MAINTAINER= beat@FreeBSD.org COMMENT= Round Robin Database Tools v1.2 @@ -14,9 +15,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ png15:${PORTSDIR}/graphics/png -LATEST_LINK= ${PORTNAME}12 - -CONFLICTS= rrdtool-1.0* rrdtool-1.3* +CONFLICTS= rrdtool10-* rrdtool-1.* USE_AUTOTOOLS= libtool USE_LDCONFIG= yes diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile index dfd1a1d1dcdb..d2f0bf1ae259 100644 --- a/devel/flex-sdk/Makefile +++ b/devel/flex-sdk/Makefile @@ -11,7 +11,7 @@ COMMENT= Adobe Flex SDK RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper -CONFLICTS= ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-3.* +CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.* USE_ZIP= YES USE_JAVA= YES JAVA_VERSION= 1.6+ diff --git a/devel/flex-sdk2/Makefile b/devel/flex-sdk2/Makefile index 144fbcb6803b..c3bbc1cc4513 100644 --- a/devel/flex-sdk2/Makefile +++ b/devel/flex-sdk2/Makefile @@ -6,6 +6,7 @@ PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= # DISTFILES= flex_sdk_2_194515.zip +PKGNAMESUFFIX= 2 MAINTAINER= kuriyama@FreeBSD.org COMMENT= Adobe Flex SDK @@ -14,8 +15,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper RESTRICTED= Need agreement before download -CONFLICTS= ja-flex-sdk-2.* flex-sdk-3.* flex-sdk-4.* -NO_LATEST_LINK= YES +CONFLICTS= ja-flex-sdk-2.* flex-sdk3-3.* flex-sdk-4.* USE_ZIP= YES USE_JAVA= YES JAVA_VERSION= 1.6+ diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile index 5c05bde77d9d..6e6e60ce42f1 100644 --- a/devel/flex-sdk35/Makefile +++ b/devel/flex-sdk35/Makefile @@ -6,14 +6,14 @@ PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= http://fpdownload.adobe.com/pub/flex/sdk/builds/flex3/ DISTFILES= flex_sdk_${PORTVERSION}_mpl.zip +PKGNAMESUFFIX= 3 MAINTAINER= kuriyama@FreeBSD.org COMMENT= Adobe Flex SDK RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper -CONFLICTS= ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-4.* -NO_LATEST_LINK= YES +CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.* USE_ZIP= YES USE_JAVA= YES JAVA_VERSION= 1.6+ diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile index a80e6611281a..6c11dc497e29 100644 --- a/devel/msp430-gcc/Makefile +++ b/devel/msp430-gcc/Makefile @@ -33,7 +33,7 @@ LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ libmpfr.so:${PORTSDIR}/math/mpfr \ libmpc.so:${PORTSDIR}/math/mpc -CONFLICTS= msp430-gcc-3.* +CONFLICTS= msp430-gcc3-3.* GCCVERSION= 4.6.3 LTSVERSION= 20120406 diff --git a/devel/msp430-gcc3/Makefile b/devel/msp430-gcc3/Makefile index 3d7463af5f9e..8840943dc620 100644 --- a/devel/msp430-gcc3/Makefile +++ b/devel/msp430-gcc3/Makefile @@ -10,6 +10,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEWARE} \ http://lev.serebryakov.spb.ru/download/msp430/:patches MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTNAME}-${GCCVERSION} PKGNAMEPREFIX= msp430- +PKGNAMESUFFIX= 3 DISTFILES= ${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \ ${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}.${PATCHVERSION}${EXTRACT_SUFX}:patches @@ -24,7 +25,6 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \ ${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils CONFLICTS= msp430-gcc-4.* -LATEST_LINK= ${PKGBASE}3 GCCVERSION= 3.4.4 PATCHVERSION= 20050317 diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 4ea601125b34..aecd4539d0c3 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -22,7 +22,7 @@ LICENSE_NAME= IBM PUBLIC LICENSE VERSION 1.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS= courier-0.* postfix-1.* postfix-2.* postfix-base-2.* \ +CONFLICTS= courier-0.* postfix-1.* postfix-2.* postfix-base-2.* postfix2[789]-* \ sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* USERS= postfix diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index ec221a66c6bf..288c39c77937 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -22,7 +22,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept VDAVERSION= 2.10.0 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-9].* postfix-base-2.[0-9].* \ +CONFLICTS= courier-0.* postfix-1.* postfix2?-* \ postfix-current-2.* postfix-current-base-2.* sendmail-8.* \ sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]* diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index 674aba041860..45f8bcc4a11a 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DIST_SUBDIR= ${PORTNAME} +PKGNAMESUFFIX= 27 MAINTAINER= sahil@FreeBSD.org COMMENT= Secure alternative to widely-used Sendmail @@ -22,14 +23,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept VDAVERSION= 2.7.13 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-689].* postfix-base-2.[0-689].* \ +CONFLICTS= courier-0.* postfix-1.* postfix2[89]-* \ postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \ postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \ smail-3.* zmailer-2.* opensmtpd-[0-9]* USERS= postfix GROUPS= mail maildrop postfix -NO_LATEST_LINK= yes USES= perl5 USE_PERL5= build USE_SUBMAKE= yes @@ -227,7 +227,7 @@ PLIST_SUB+= TEST="@comment " .endif .if ${PORT_OPTIONS:MINST_BASE} -PKGNAMESUFFIX= -base +PKGNAMESUFFIX= 27-base PREFIX= /usr ETCDIR= /etc/postfix USE_RCORDER= postfix diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index c0008577b2a5..349c58536be2 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DIST_SUBDIR= ${PORTNAME} +PKGNAMESUFFIX= 28 MAINTAINER= sahil@FreeBSD.org COMMENT= Secure alternative to widely-used Sendmail @@ -22,13 +23,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept VDAVERSION= 2.8.14 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-79].* postfix-base-2.[0-79].* \ +CONFLICTS= courier-0.* postfix-1.* postfix2[79]-* \ postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \ postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \ smail-3.* zmailer-2.* opensmtpd-[0-9]* -NO_LATEST_LINK= yes - USERS= postfix GROUPS= mail maildrop postfix USES= perl5 @@ -250,7 +249,7 @@ PLIST_SUB+= TEST="@comment " .endif .if ${PORT_OPTIONS:MINST_BASE} -PKGNAMESUFFIX= -base +PKGNAMESUFFIX= 28-base PREFIX= /usr ETCDIR= /etc/postfix USE_RCORDER= postfix diff --git a/mail/postfix29/Makefile b/mail/postfix29/Makefile index ab1e17889002..ae14db858af6 100644 --- a/mail/postfix29/Makefile +++ b/mail/postfix29/Makefile @@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DIST_SUBDIR= ${PORTNAME} +PKGNAMESUFFIX= 29 MAINTAINER= sahil@FreeBSD.org COMMENT= Secure alternative to widely-used Sendmail @@ -22,13 +23,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept VDAVERSION= 2.9.6 -CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-8].* postfix-base-2.[0-8].* \ +CONFLICTS= courier-0.* postfix-1.* postfix2[78]-* \ postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \ postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \ smail-3.* zmailer-2.* opensmtpd-[0-9]* -NO_LATEST_LINK= yes - USERS= postfix GROUPS= mail maildrop postfix USES= perl5 @@ -250,7 +249,7 @@ PLIST_SUB+= TEST="@comment " .endif .if ${PORT_OPTIONS:MINST_BASE} -PKGNAMESUFFIX= -base +PKGNAMESUFFIX= 29-base PREFIX= /usr ETCDIR= /etc/postfix USE_RCORDER= postfix diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile index 90226046ea00..36065e26e3d3 100644 --- a/net/trafshow/Makefile +++ b/net/trafshow/Makefile @@ -13,6 +13,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= alexey@renatasystems.org COMMENT= Full screen visualization of network traffic +CONFLICTS= trafshow-4.* trafshow3-* + GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" ALL_TARGET= trafshow diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile index f2986a92d47b..74bd665ab3fc 100644 --- a/net/trafshow3/Makefile +++ b/net/trafshow3/Makefile @@ -8,6 +8,7 @@ PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= sem +PKGNAMESUFFIX= 3 EXTRACT_SUFX= .tgz MAINTAINER= sem@FreeBSD.org @@ -15,8 +16,6 @@ COMMENT= Full screen visualization of network traffic (an ancient version) CONFLICTS= trafshow-[45].* -LATEST_LINK= trafshow3 - .if defined(WITH_TRAFSHOW_SLANG) || \ (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG)) LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2 diff --git a/www/cakephp11/Makefile b/www/cakephp11/Makefile index 970528e8891e..a70609b058c8 100644 --- a/www/cakephp11/Makefile +++ b/www/cakephp11/Makefile @@ -7,19 +7,18 @@ PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin +PKGNAMESUFFIX= 11 DISTNAME= cake_${PORTVERSION} MAINTAINER= glarkin@FreeBSD.org COMMENT= A framework for developing PHP web applications -LATEST_LINK= cakephp11 - USE_BZIP2= yes USE_APACHE_RUN= 22+ SLAVE_PORT_MODULES= REWRITE -CONFLICTS= cakephp-1.[23].* cakephp-2.* +CONFLICTS= cakephp-1[23]-* cakephp-2?-.* cakephp-2.3.* NO_BUILD= yes USE_PHP= pcre session diff --git a/www/cakephp12/Makefile b/www/cakephp12/Makefile index 7164e6272926..52c42120d4a1 100644 --- a/www/cakephp12/Makefile +++ b/www/cakephp12/Makefile @@ -6,13 +6,12 @@ PORTVERSION= 1.2.10 CATEGORIES= www MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/ \ LOCAL/glarkin +PKGNAMESUFFIX= 12 DISTNAME= ${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION} MAINTAINER= glarkin@FreeBSD.org COMMENT= A framework for developing PHP web applications -LATEST_LINK= cakephp12 - GITVERSION= 0-ge6e50e8 FETCH_ARGS= -pRr WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-da67eb8 @@ -21,7 +20,7 @@ PORTDOCS= README SLAVE_PORT_MODULES= REWRITE -CONFLICTS= cakephp-1.[13].* cakephp-2.* +CONFLICTS= cakephp-1[13]-* cakephp-2?-.* cakephp-2.3.* NO_BUILD= yes USES= gettext diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile index 6b28cf9d03dc..8df08075738d 100644 --- a/www/cakephp13/Makefile +++ b/www/cakephp13/Makefile @@ -20,7 +20,7 @@ PORTDOCS= README SLAVE_PORT_MODULES= REWRITE -CONFLICTS= cakephp-1.[12].* cakephp-2.* +CONFLICTS= cakephp-1[12]-* cakephp-2?-.* cakephp-2.3.* NO_BUILD= yes USES= gettext diff --git a/www/cakephp21/Makefile b/www/cakephp21/Makefile index 498e5102cdb4..14d8caabc97c 100644 --- a/www/cakephp21/Makefile +++ b/www/cakephp21/Makefile @@ -21,7 +21,7 @@ PORTDOCS= README SLAVE_PORT_MODULES= REWRITE -CONFLICTS= cakephp-1.* cakephp-2.[23].* +CONFLICTS= cakephp-1?-* cakephp-2[2]-.* cakephp-2.3.* NO_BUILD= yes USES= gettext diff --git a/www/cakephp22/Makefile b/www/cakephp22/Makefile index 833e2f0b2af1..01f5efcd2603 100644 --- a/www/cakephp22/Makefile +++ b/www/cakephp22/Makefile @@ -4,12 +4,11 @@ PORTNAME= cakephp PORTVERSION= 2.2.7 CATEGORIES= www +PKGNAMESUFFIX= 22 MAINTAINER= pphillips@experts-exchange.com COMMENT= A framework for developing PHP web applications -LATEST_LINK= cakephp22 - LICENSE= MIT USE_GITHUB= yes @@ -20,7 +19,7 @@ PORTDOCS= README.md SLAVE_PORT_MODULES= REWRITE -CONFLICTS= cakephp-1.* cakephp-2.[13].* +CONFLICTS= cakephp-1?-* cakephp-2[1]-.* cakephp-2.3.* NO_BUILD= yes USES= gettext diff --git a/www/cakephp23/Makefile b/www/cakephp23/Makefile index 195c1cdccc79..da9ac44e7ffc 100644 --- a/www/cakephp23/Makefile +++ b/www/cakephp23/Makefile @@ -18,7 +18,7 @@ PORTDOCS= README.md SLAVE_PORT_MODULES= REWRITE -CONFLICTS= cakephp-1.* cakephp-2.[12].* +CONFLICTS= cakephp-1?-* cakephp-2[12]-.* NO_BUILD= yes USES= gettext diff --git a/www/squid/Makefile b/www/squid/Makefile index 771bb15820b8..e77f47518d41 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -114,7 +114,7 @@ COMMENT= HTTP Caching Proxy SQUID_STABLE_VER= 9 -CONFLICTS_INSTALL= squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]* +CONFLICTS_INSTALL= squid-2.[^7]* squid3?-* cacheboy-[0-9]* lusca-head-[0-9]* USES= perl5 GNU_CONFIGURE= yes USE_BZIP2= yes diff --git a/www/squid32/Makefile b/www/squid32/Makefile index 1a85717561ab..0990bd36adfc 100644 --- a/www/squid32/Makefile +++ b/www/squid32/Makefile @@ -21,6 +21,7 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://www1.za.squid-cache.org/Versions/v3/3.2/ MASTER_SITE_SUBDIR= squid DIST_SUBDIR= squid3.2 +PKGNAMESUFFIX= 32 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www2.us.squid-cache.org/%SUBDIR%/ \ @@ -39,11 +40,9 @@ COMMENT= HTTP Caching Proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LATEST_LINK= squid32 - SQUID_STABLE_VER= 13 -CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[!2].* cacheboy-[0-9]* lusca-head-[0-9]* +CONFLICTS_INSTALL= squid-2.[0-9].* squid33-* cacheboy-[0-9]* lusca-head-[0-9]* USES= perl5 GNU_CONFIGURE= yes USE_BZIP2= yes diff --git a/www/squid33/Makefile b/www/squid33/Makefile index 2663b6bb97e9..6f25fe060462 100644 --- a/www/squid33/Makefile +++ b/www/squid33/Makefile @@ -21,6 +21,7 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://www1.za.squid-cache.org/Versions/v3/${PORTVERSION:R}/ MASTER_SITE_SUBDIR= squid DIST_SUBDIR= squid3.3 +PKGNAMESUFFIX= 33 PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www2.us.squid-cache.org/%SUBDIR%/ \ @@ -39,11 +40,9 @@ COMMENT= HTTP Caching Proxy LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LATEST_LINK= squid33 - SQUID_STABLE_VER= 11 -CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[!3].* cacheboy-[0-9]* lusca-head-[0-9]* +CONFLICTS_INSTALL= squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]* USES= perl5 GNU_CONFIGURE= yes USE_BZIP2= yes |