From owner-svn-ports-head@FreeBSD.ORG Fri Apr 26 19:52:03 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 3DD084EF; Fri, 26 Apr 2013 19:52:03 +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 1F8CB1B35; Fri, 26 Apr 2013 19:52:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3QJq3wj025068; Fri, 26 Apr 2013 19:52:03 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3QJq2dd025064; Fri, 26 Apr 2013 19:52:02 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201304261952.r3QJq2dd025064@svn.freebsd.org> From: Florian Smeets Date: Fri, 26 Apr 2013 19:52:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316631 - in head: . Mk databases databases/mysql41-client databases/mysql41-scripts databases/mysql41-server databases/p5-DBD-mysql41 mail/dspam 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: Fri, 26 Apr 2013 19:52:03 -0000 Author: flo Date: Fri Apr 26 19:52:01 2013 New Revision: 316631 URL: http://svnweb.freebsd.org/changeset/ports/316631 Log: Remove MySQL 4.1, it has been unsupported upstream for almost 3.5 years. Approved by: ale Deleted: head/databases/mysql41-client/ head/databases/mysql41-scripts/ head/databases/mysql41-server/ head/databases/p5-DBD-mysql41/ Modified: head/MOVED head/Mk/bsd.database.mk head/databases/Makefile head/mail/dspam/Makefile (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Fri Apr 26 18:58:58 2013 (r316630) +++ head/MOVED Fri Apr 26 19:52:01 2013 (r316631) @@ -4221,3 +4221,7 @@ print/psutils-a4|print/psutils|2013-04-2 print/psutils-letter|print/psutils|2013-04-24|Merged into print/psutils editors/tamago-emacs21||2013-04-24|Removed: obsolete devel/py-extended_threading||2013-04-26|Has expired: checksum mismatch; domain disappeared +databases/mysql41-server||2013-04-26|Unsupported upstream since 2009-12-31 +databases/mysql41-client||2013-04-26|Unsupported upstream since 2009-12-31 +databases/mysql41-scripts||2013-04-26|Unsupported upstream since 2009-12-31 +databases/p5-DBD-mysql41||2013-04-26|Depends on databases/mysql41-server, which was removed Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Fri Apr 26 18:58:58 2013 (r316630) +++ head/Mk/bsd.database.mk Fri Apr 26 19:52:01 2013 (r316631) @@ -105,7 +105,6 @@ Database_Include_MAINTAINER= ports@FreeB .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= 55 # MySQL client version currently supported. -MYSQL41_LIBVER= 14 MYSQL50_LIBVER= 15 MYSQL51_LIBVER= 16 MYSQL53m_LIBVER= 16 @@ -168,10 +167,6 @@ _MYSQL_CLIENT= databases/mysql${MYSQL_VE _MYSQL_SERVER= databases/mysql${MYSQL_VER}-server .endif -.if (${USE_MYSQL} == "embedded") -IGNORE_WITH_MYSQL= 41 -.endif - # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) .if defined(IGNORE_WITH_MYSQL) Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Fri Apr 26 18:58:58 2013 (r316630) +++ head/databases/Makefile Fri Apr 26 19:52:01 2013 (r316631) @@ -228,9 +228,6 @@ SUBDIR += mysql-xql SUBDIR += mysql2odbc SUBDIR += mysql2pgsql - SUBDIR += mysql41-client - SUBDIR += mysql41-scripts - SUBDIR += mysql41-server SUBDIR += mysql50-client SUBDIR += mysql50-scripts SUBDIR += mysql50-server @@ -334,7 +331,6 @@ SUBDIR += p5-DBD-XBase SUBDIR += p5-DBD-cego SUBDIR += p5-DBD-mysql - SUBDIR += p5-DBD-mysql41 SUBDIR += p5-DBD-mysql50 SUBDIR += p5-DBD-mysql51 SUBDIR += p5-DBD-mysql52 Modified: head/mail/dspam/Makefile ============================================================================== --- head/mail/dspam/Makefile Fri Apr 26 18:58:58 2013 (r316630) +++ head/mail/dspam/Makefile Fri Apr 26 19:52:01 2013 (r316631) @@ -36,8 +36,6 @@ OPTIONS+= CLAMAV "Enable clamav support" OPTIONS+= CLAMAV_DEVEL "Enable clamav support" off OPTIONS+= CLAMAV_LOCAL "RUN_DEPEND on selected clamav" on # -OPTIONS+= MYSQL40 "Use MySQL 4.0.x as back-end" off -OPTIONS+= MYSQL41 "Use MySQL 4.1.x as back-end" off 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 @@ -240,13 +238,7 @@ _DBDRV:= ${_DBDRV:S/hash_drv,//} PLIST_SUB+= HASH="@comment " .endif -.ifdef(WITH_MYSQL40) -WANT_MYSQL_VER= 40 -#PKGNAMESUFFIX= -mysql40 -.elifdef(WITH_MYSQL41) -WANT_MYSQL_VER= 41 -#PKGNAMESUFFIX= -mysql41 -.elifndef(WITHOUT_MYSQL50) +.ifndef(WITHOUT_MYSQL50) WANT_MYSQL_VER= 50 #PKGNAMESUFFIX= -mysql50 .elifdef(WITH_MYSQL51) @@ -257,8 +249,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(WITHOUT_MYSQL50) || defined(WITH_MYSQL51) || defined(WITH_MYSQL55) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql @@ -340,7 +331,7 @@ LDA_COUNT:= ${LDA_COUNT:S/o//} .endif .ifdef(WITH_EXIM_LDA) -. ifdef(WITH_MYSQL40) || (WITH_MYSQL41) +. ifdef(WITH_MYSQL50) || (WITH_MYSQL51) || (WITH_MYSQL55) _EXIM_EXT= -mysql . elifdef(WITH_POSTGRESQL) _EXIM_EXT= -postgresql @@ -511,7 +502,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(WITHOUT_MYSQL50) && defined(WITH_MYSQL51)) @${ECHO_CMD} "You can compile with only one MySQL version driver." @${FALSE} .endif