o Add CONFLICTS sections.

o Fix packages dependencies.
o portlint clean
o Correct typo in MASTER_SITES, Fix non-optimized build.

PR:		ports/60559
Submitted by:	Alex Dupre <sysadmin@alexdupre.com>
This commit is contained in:
Norikatsu Shigemura 2003-12-26 16:56:52 +00:00
parent 0f78d50ccb
commit 6af6d64e7e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=96629
23 changed files with 136 additions and 32 deletions

View File

@ -97,8 +97,9 @@ CONFIGURE_ENV+= CXX="${CC}"
INFO= mysql
.endif
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
CONFLICTS= mysql-server-4.* mysql-server-5.*
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}
@ -171,6 +172,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-4.* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
perror.1 replace.1 safe_mysqld.1

View File

@ -99,8 +99,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql40
CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.*
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}
@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1

View File

@ -9,10 +9,10 @@ PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -client
MAINTAINER= sysadmin@alexdupre.com
COMMENT= Multithreaded SQL database (client)
MASTERDIR= ${.CURDIR}/../mysql41-server
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client

View File

@ -9,7 +9,7 @@ PORTNAME?= mysql
PORTVERSION= 4.1.1
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
ONLY_FOR_ARCHS= i386 alpha sparc64
@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1

View File

@ -61,6 +61,17 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12678,8 +12644,8 @@
# Some system specific hacks
#
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
case $SYSTEM_TYPE in
*solaris2.7*)
@@ -23893,7 +23859,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;

View File

@ -9,10 +9,10 @@ PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -client
MAINTAINER= sysadmin@alexdupre.com
COMMENT= Multithreaded SQL database (client)
MASTERDIR= ${.CURDIR}/../mysql41-server
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client

View File

@ -9,7 +9,7 @@ PORTNAME?= mysql
PORTVERSION= 4.1.1
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
ONLY_FOR_ARCHS= i386 alpha sparc64
@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1

View File

@ -61,6 +61,17 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12678,8 +12644,8 @@
# Some system specific hacks
#
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
case $SYSTEM_TYPE in
*solaris2.7*)
@@ -23893,7 +23859,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;

View File

@ -9,10 +9,10 @@ PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -client
MAINTAINER= sysadmin@alexdupre.com
COMMENT= Multithreaded SQL database (client)
MASTERDIR= ${.CURDIR}/../mysql41-server
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client

View File

@ -9,7 +9,7 @@ PORTNAME?= mysql
PORTVERSION= 4.1.1
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
ONLY_FOR_ARCHS= i386 alpha sparc64
@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1

View File

@ -61,6 +61,17 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12678,8 +12644,8 @@
# Some system specific hacks
#
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
case $SYSTEM_TYPE in
*solaris2.7*)
@@ -23893,7 +23859,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;

View File

@ -9,10 +9,10 @@ PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -client
MAINTAINER= sysadmin@alexdupre.com
COMMENT= Multithreaded SQL database (client)
MASTERDIR= ${.CURDIR}/../mysql41-server
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client

View File

@ -9,7 +9,7 @@ PORTNAME?= mysql
PORTVERSION= 4.1.1
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
ONLY_FOR_ARCHS= i386 alpha sparc64
@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1

View File

@ -61,6 +61,17 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12678,8 +12644,8 @@
# Some system specific hacks
#
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
case $SYSTEM_TYPE in
*solaris2.7*)
@@ -23893,7 +23859,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;

View File

@ -9,10 +9,10 @@ PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -client
MAINTAINER= sysadmin@alexdupre.com
COMMENT= Multithreaded SQL database (client)
MASTERDIR= ${.CURDIR}/../mysql41-server
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client

View File

@ -9,7 +9,7 @@ PORTNAME?= mysql
PORTVERSION= 4.1.1
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
ONLY_FOR_ARCHS= i386 alpha sparc64
@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1

View File

@ -61,6 +61,17 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12678,8 +12644,8 @@
# Some system specific hacks
#
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
case $SYSTEM_TYPE in
*solaris2.7*)
@@ -23893,7 +23859,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;

View File

@ -9,10 +9,10 @@ PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -client
MAINTAINER= sysadmin@alexdupre.com
COMMENT= Multithreaded SQL database (client)
MASTERDIR= ${.CURDIR}/../mysql41-server
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client

View File

@ -9,7 +9,7 @@ PORTNAME?= mysql
PORTVERSION= 4.1.1
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
ONLY_FOR_ARCHS= i386 alpha sparc64
@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1

View File

@ -61,6 +61,17 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12678,8 +12644,8 @@
# Some system specific hacks
#
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
case $SYSTEM_TYPE in
*solaris2.7*)
@@ -23893,7 +23859,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;

View File

@ -9,10 +9,10 @@ PORTNAME= mysql
PORTREVISION= 0
PKGNAMESUFFIX= -client
MAINTAINER= sysadmin@alexdupre.com
COMMENT= Multithreaded SQL database (client)
MASTERDIR= ${.CURDIR}/../mysql41-server
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client

View File

@ -9,7 +9,7 @@ PORTNAME?= mysql
PORTVERSION= 4.1.1
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions
.if !defined(CLIENT_ONLY)
USE_PERL5_RUN= yes
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \
${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
ONLY_FOR_ARCHS= i386 alpha sparc64
@ -170,6 +171,8 @@ post-install:
# MySQL-Client part
.else
CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \
mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1

View File

@ -61,6 +61,17 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12678,8 +12644,8 @@
# Some system specific hacks
#
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
case $SYSTEM_TYPE in
*solaris2.7*)
@@ -23893,7 +23859,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;