From owner-svn-ports-head@FreeBSD.ORG Tue Jun 4 18:01:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DA9D2EAC; Tue, 4 Jun 2013 18:01:48 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BD08611D1; Tue, 4 Jun 2013 18:01:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r54I1mnl099252; Tue, 4 Jun 2013 18:01:48 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r54I1lZa099241; Tue, 4 Jun 2013 18:01:47 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201306041801.r54I1lZa099241@svn.freebsd.org> From: Florian Smeets Date: Tue, 4 Jun 2013 18:01:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319886 - in head: . Mk databases databases/mysql50-client databases/mysql50-scripts databases/mysql50-server databases/p5-DBD-mysql50 deskutils/moregroupware mail/dspam mail/dspam-deve... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 18:01:48 -0000 Author: flo Date: Tue Jun 4 18:01:46 2013 New Revision: 319886 URL: http://svnweb.freebsd.org/changeset/ports/319886 Log: Remove MySQL 5.0, it has been unsupported upstream for about 1.5 years Approved by: ale (maintainer) Deleted: head/databases/mysql50-client/ head/databases/mysql50-scripts/ head/databases/mysql50-server/ head/databases/p5-DBD-mysql50/ Modified: head/MOVED head/Mk/bsd.database.mk head/databases/Makefile head/deskutils/moregroupware/Makefile head/mail/dspam-devel/Makefile (contents, props changed) head/mail/dspam/Makefile head/net-mgmt/netams/Makefile (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Tue Jun 4 17:29:21 2013 (r319885) +++ head/MOVED Tue Jun 4 18:01:46 2013 (r319886) @@ -4360,3 +4360,7 @@ devel/sparc-rtems-gdb||2013-06-03|Has ex devel/mips-rtems-gdb||2013-06-03|Has expired: many issues; see https://www.rtems.org/bugzilla/show_bug.cgi?id=2099 devel/powerpc-rtems-gdb||2013-06-03|Has expired: many issues; see https://www.rtems.org/bugzilla/show_bug.cgi?id=2099 databases/php-sqlite3||2013-06-03|Has expired: No upstream development and superseded by databases/php5-sqlite3 and databases/php53-sqlite3 +databases/mysql50-server||2013-06-04|Unsupported upstream since 2012-01-09 +databases/mysql50-client||2013-06-04|Unsupported upstream since 2012-01-09 +databases/mysql50-scripts||2013-06-04|Unsupported upstream since 2012-01-09 +databases/p5-DBD-mysql50||2013-06-04|Depends on databases/mysql41-server, which was removed Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Tue Jun 4 17:29:21 2013 (r319885) +++ head/Mk/bsd.database.mk Tue Jun 4 18:01:46 2013 (r319886) @@ -105,7 +105,6 @@ Database_Include_MAINTAINER= ports@FreeB .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= 55 # MySQL client version currently supported. -MYSQL50_LIBVER= 15 MYSQL51_LIBVER= 16 MYSQL53m_LIBVER= 16 MYSQL55_LIBVER= 18 Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Tue Jun 4 17:29:21 2013 (r319885) +++ head/databases/Makefile Tue Jun 4 18:01:46 2013 (r319886) @@ -228,9 +228,6 @@ SUBDIR += mysql-xql SUBDIR += mysql2odbc SUBDIR += mysql2pgsql - SUBDIR += mysql50-client - SUBDIR += mysql50-scripts - SUBDIR += mysql50-server SUBDIR += mysql51-client SUBDIR += mysql51-scripts SUBDIR += mysql51-server @@ -331,7 +328,6 @@ SUBDIR += p5-DBD-XBase SUBDIR += p5-DBD-cego SUBDIR += p5-DBD-mysql - SUBDIR += p5-DBD-mysql50 SUBDIR += p5-DBD-mysql51 SUBDIR += p5-DBD-mysql52 SUBDIR += p5-DBD-mysql55 Modified: head/deskutils/moregroupware/Makefile ============================================================================== --- head/deskutils/moregroupware/Makefile Tue Jun 4 17:29:21 2013 (r319885) +++ head/deskutils/moregroupware/Makefile Tue Jun 4 18:01:46 2013 (r319886) @@ -32,7 +32,7 @@ USES+= gettext .if ${PORT_OPTIONS:MPGSQL} RUN_DEPENDS+= ${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql74-server .else -RUN_DEPENDS+= ${LOCALBASE}/bin/mysql:${PORTSDIR}/databases/mysql50-server +USE_MYSQL= server .endif .if ${PORT_OPTIONS:MADDONS} Modified: head/mail/dspam-devel/Makefile ============================================================================== --- head/mail/dspam-devel/Makefile Tue Jun 4 17:29:21 2013 (r319885) +++ head/mail/dspam-devel/Makefile Tue Jun 4 18:01:46 2013 (r319886) @@ -51,7 +51,6 @@ OPTIONS+= CLAMAV "Enable clamav support" OPTIONS+= CLAMAV_DEVEL "Enable clamav support" off OPTIONS+= CLAMAV_LOCAL "RUN_DEPEND on selected clamav" on # -OPTIONS+= MYSQL50 "Use MySQL 5.0.x as back-end" off OPTIONS+= MYSQL51 "Use MySQL 5.1.x as back-end" off OPTIONS+= MYSQL55 "Use MySQL 5.5.x as back-end" on OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off @@ -256,10 +255,7 @@ _DBDRV:= ${_DBDRV:S/hash_drv,//} PLIST_SUB+= HASH="@comment " .endif -.ifndef(WITHOUT_MYSQL50) -WANT_MYSQL_VER= 50 -#PKGNAMESUFFIX= -mysql50 -.elifdef(WITH_MYSQL51) +.ifdef(WITH_MYSQL51) WANT_MYSQL_VER= 51 #PKGNAMESUFFIX= -mysql51 .elifdef(WITH_MYSQL55) @@ -267,8 +263,7 @@ WANT_MYSQL_VER= 55 #PKGNAMESUFFIX= -mysql55 .endif -.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) || \ - !defined(WITHOUT_MYSQL50) || defined(WITH_MYSQL51) || defined(WITH_MYSQL55) +.if defined(WITH_MYSQL51) || defined(WITH_MYSQL55) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql @@ -356,7 +351,7 @@ LDA_COUNT:= ${LDA_COUNT:S/o//} .endif .ifdef(WITH_EXIM_LDA) -. ifdef(WITH_MYSQL40) || (WITH_MYSQL41) +. ifdef(WITH_MYSQL51) || (WITH_MYSQL55) _EXIM_EXT= -mysql . elifdef(WITH_POSTGRESQL) _EXIM_EXT= -postgresql @@ -528,7 +523,7 @@ pre-configure: @${ECHO_CMD} "You need MySQL, PostgreSQL or Hash for Daemon mode, because multithreading support is needed" @${FALSE} .endif -.if ( defined(WITH_MYSQL40) && defined(WITH_MYSQL41) && !defined(WITHOUT_MYSQL50) && defined(WITH_MYSQL51)) +.if (defined(WITH_MYSQL51) && defined(WITH_MYSQL55)) @${ECHO_CMD} "You can compile with only one MySQL version driver." @${FALSE} .endif Modified: head/mail/dspam/Makefile ============================================================================== --- head/mail/dspam/Makefile Tue Jun 4 17:29:21 2013 (r319885) +++ head/mail/dspam/Makefile Tue Jun 4 18:01:46 2013 (r319886) @@ -36,7 +36,6 @@ OPTIONS+= CLAMAV "Enable clamav support" OPTIONS+= CLAMAV_DEVEL "Enable clamav support" off OPTIONS+= CLAMAV_LOCAL "RUN_DEPEND on selected clamav" on # -OPTIONS+= MYSQL50 "Use MySQL 5.0.x as back-end" on OPTIONS+= MYSQL51 "Use MySQL 5.1.x as back-end" off OPTIONS+= MYSQL55 "Use MySQL 5.5.x as back-end" off OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off @@ -238,10 +237,7 @@ _DBDRV:= ${_DBDRV:S/hash_drv,//} PLIST_SUB+= HASH="@comment " .endif -.ifndef(WITHOUT_MYSQL50) -WANT_MYSQL_VER= 50 -#PKGNAMESUFFIX= -mysql50 -.elifdef(WITH_MYSQL51) +.ifdef(WITH_MYSQL51) WANT_MYSQL_VER= 51 #PKGNAMESUFFIX= -mysql51 .elifdef(WITH_MYSQL55) @@ -249,7 +245,7 @@ WANT_MYSQL_VER= 55 #PKGNAMESUFFIX= -mysql55 .endif -.if !defined(WITHOUT_MYSQL50) || defined(WITH_MYSQL51) || defined(WITH_MYSQL55) +.if defined(WITH_MYSQL51) || defined(WITH_MYSQL55) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql @@ -331,7 +327,7 @@ LDA_COUNT:= ${LDA_COUNT:S/o//} .endif .ifdef(WITH_EXIM_LDA) -. ifdef(WITH_MYSQL50) || (WITH_MYSQL51) || (WITH_MYSQL55) +. ifdef(WITH_MYSQL51) || (WITH_MYSQL55) _EXIM_EXT= -mysql . elifdef(WITH_POSTGRESQL) _EXIM_EXT= -postgresql @@ -502,7 +498,7 @@ pre-configure: @${ECHO_CMD} "You need MySQL, PostgreSQL or Hash for Daemon mode, because multithreading support is needed" @${FALSE} .endif -.if (!defined(WITHOUT_MYSQL50) && defined(WITH_MYSQL51)) +.if (defined(WITH_MYSQL51) && defined(WITH_MYSQL55)) @${ECHO_CMD} "You can compile with only one MySQL version driver." @${FALSE} .endif Modified: head/net-mgmt/netams/Makefile ============================================================================== --- head/net-mgmt/netams/Makefile Tue Jun 4 17:29:21 2013 (r319885) +++ head/net-mgmt/netams/Makefile Tue Jun 4 18:01:46 2013 (r319886) @@ -66,7 +66,7 @@ RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/ .endif .if ${PORT_OPTIONS:MMYSQL} && ${PORT_OPTIONS:MCGI} -RUN_DEPENDS+= p5-DBD-mysql50>=0:${PORTSDIR}/databases/p5-DBD-mysql50 +RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql .endif .if ${PORT_OPTIONS:MCGI}