Attachment #36402 for bug #58377

View | Details | Raw Unified | Return to bug 58377
Collapse All | Expand All




#

PORTNAME?=	mysql
PORTVERSION=	4.0.16
PORTREVISION?=	0
CATEGORIES=	databases
MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
		http://mysql.tzone.it/Downloads/MySQL-4.0/ \
		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \
		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
		http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \

.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif

.include <bsd.port.pre.mk>

.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
.endif
.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
.endif

.if defined(BUILD_STATIC)
CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
.endif

.include <bsd.port.pre.mk>

.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
.endif
.if defined(WITH_LINUXTHREADS)
CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R

.endif
.endif

.if ${OSVERSION} < 500000
CXX=		${CC}
.endif
.if defined(BUILD_OPTIMIZED)
CFLAGS+=	-O3 -fno-omit-frame-pointer
.if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3))
CFLAGS+=	-fno-gcse
.endif
CXXFLAGS+=	${CFLAGS} -felide-constructors -fno-rtti
.if ${OSVERSION} >= 400002
CXXFLAGS+=	-fno-exceptions
.endif
.if ${OSVERSION} < 500000
CXX=		${CC}
.endif

# MySQL-Server part

	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
	@${ECHO} "				reverse lookup  before inserting local"
	@${ECHO} "				hostname into mysql database"
	@${ECHO} "				(use it if your machine has no official DNS entry)."
	@${ECHO} "	BUILD_OPTIMIZED=yes	Enable compiler optimizations"
	@${ECHO} "				(use it if you need speed)."
	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
	@${ECHO} "				(use it if you need even more speed)."
	@${ECHO} ""

post-patch:

Line 1 Link Here

(-)mysql40-server/distinfo (-1 / +1 lines)
1	MD5 (mysql-4.0.15.tar.gz) = a6ce917730e8778ef7c9e1f7b5053b2d	1	MD5 (mysql-4.0.16.tar.gz) = ddc959b9cdc2f5e30dc6a4d3650d3db5




--- configure.orig	Fri Oct 17 07:29:41 2003
+++ configure	Wed Oct 22 15:12:52 2003
@@ -8116,6 +8116,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"

 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -9058,7 +9059,7 @@
   ;;
 esac
 fi

 
 if test -n "$HOSTNAME"; then
   echo "$as_me:$LINENO: result: $HOSTNAME" >&5
@@ -9250,43 +9251,8 @@
 echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
 echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
 PS=$ac_cv_path_PS

 
 echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
 echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -12667,8 +12633,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*)
@@ -22458,7 +22424,7 @@
 	/* ) rel_srcdir="$srcdir" ;;
 	* )  rel_srcdir="../$srcdir" ;;
     esac

Lines 102-107 Link Here

(-)mysql40-server/pkg-plist (+1 lines)
102	share/mysql/MySQL-shared-compat.spec	102	share/mysql/MySQL-shared-compat.spec
103	share/mysql/StartupParameters.plist	103	share/mysql/StartupParameters.plist
104	share/mysql/binary-configure	104	share/mysql/binary-configure
		105	share/mysql/make_sharedlib_distribution
105	share/mysql/postinstall	106	share/mysql/postinstall
106	share/mysql/preinstall	107	share/mysql/preinstall
107	share/mysql/charsets/Index	108	share/mysql/charsets/Index

Return to bug 58377

Lines 6-17 Link Here

(-)mysql40-server/Makefile (-17 / +19 lines)
6	#	6	#
7		7
8	PORTNAME?= mysql	8	PORTNAME?= mysql
9	PORTVERSION= 4.0.15	9	PORTVERSION= 4.0.16
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \	12	MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
13	http://mysql.tzone.it/Downloads/MySQL-4.0/ \
14	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
15	http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \	13	http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \
16	ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \	14	ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
17	http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \	15	http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \
Lines 50-60 Link Here
50	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.	48	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
51	.endif	49	.endif
52		50
53	.include <bsd.port.pre.mk>
54
55	.if ${MACHINE_ARCH} == "i386"
56	CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
57	.endif
58	.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""	51	.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
59	CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}	52	CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
60	.endif	53	.endif
Lines 68-75 Link Here
68	.if defined(BUILD_STATIC)	61	.if defined(BUILD_STATIC)
69	CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static	62	CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
70	.endif	63	.endif
71	.if defined(BUILD_OPTIMIZED)	64
72	CFLAGS+= -mcpu=i686	65	.include <bsd.port.pre.mk>
		66
		67	.if ${MACHINE_ARCH} == "i386"
		68	CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
73	.endif	69	.endif
74	.if defined(WITH_LINUXTHREADS)	70	.if defined(WITH_LINUXTHREADS)
75	CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R	71	CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
Lines 85-98 Link Here
85	.endif	81	.endif
86	.endif	82	.endif
87		83
		84	.if ${OSVERSION} < 500000
		85	CXX= ${CC}
		86	.endif
		87	.if defined(BUILD_OPTIMIZED)
88	CFLAGS+= -O3 -fno-omit-frame-pointer	88	CFLAGS+= -O3 -fno-omit-frame-pointer
89	CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti	89	.if ${OSVERSION} > 500000 \|\| (defined(USE_GCC) && (${USE_GCC} == 3.0 \|\| ${USE_GCC} == 3.1 \|\| ${USE_GCC} == 3.2 \|\| ${USE_GCC} == 3.3))
90		90	CFLAGS+= -fno-gcse
		91	.endif
		92	CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti
91	.if ${OSVERSION} >= 400002	93	.if ${OSVERSION} >= 400002
92	CXXFLAGS+= -fno-exceptions	94	CXXFLAGS+= -fno-exceptions
93	.endif	95	.endif
94	.if ${OSVERSION} < 500000
95	CXX= ${CC}
96	.endif	96	.endif
97		97
98	# MySQL-Server part	98	# MySQL-Server part
Lines 122-130 Link Here
122	@${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional DNS"	122	@${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional DNS"
123	@${ECHO} " reverse lookup before inserting local"	123	@${ECHO} " reverse lookup before inserting local"
124	@${ECHO} " hostname into mysql database"	124	@${ECHO} " hostname into mysql database"
125	@${ECHO} " (use if your machine has no official DNS entry)."	125	@${ECHO} " (use it if your machine has no official DNS entry)."
		126	@${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations"
		127	@${ECHO} " (use it if you need speed)."
126	@${ECHO} " BUILD_STATIC=yes Build a static version of mysqld."	128	@${ECHO} " BUILD_STATIC=yes Build a static version of mysqld."
127	@${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS."	129	@${ECHO} " (use it if you need even more speed)."
128	@${ECHO} ""	130	@${ECHO} ""
129		131
130	post-patch:	132	post-patch:

Lines 1-6 Link Here

(-)mysql40-server/files/patch-configure (-6 / +17 lines)
1	--- configure.orig Wed May 14 22:24:53 2003	1	--- configure.orig Fri Oct 17 07:29:41 2003
2	+++ configure Fri May 23 00:29:06 2003	2	+++ configure Wed Oct 22 15:12:52 2003
3	@@ -8110,6 +8110,7 @@	3	@@ -8116,6 +8116,7 @@
4		4
5	# This can be used to rebuild libtool when needed	5	# This can be used to rebuild libtool when needed
6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
Lines 8-14 Link Here
8		8
9	# Always use our own libtool.	9	# Always use our own libtool.
10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'	10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
11	@@ -9052,7 +9053,7 @@	11	@@ -9058,7 +9059,7 @@
12	;;	12	;;
13	esac	13	esac
14	fi	14	fi
Lines 17-23 Link Here
17		17
18	if test -n "$HOSTNAME"; then	18	if test -n "$HOSTNAME"; then
19	echo "$as_me:$LINENO: result: $HOSTNAME" >&5	19	echo "$as_me:$LINENO: result: $HOSTNAME" >&5
20	@@ -9244,43 +9245,8 @@	20	@@ -9250,43 +9251,8 @@
21	echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5	21	echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
22	echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6	22	echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
23	PS=$ac_cv_path_PS	23	PS=$ac_cv_path_PS
Lines 61-67 Link Here
61		61
62	echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5	62	echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
63	echo "${ECHO_T}\"$FIND_PROC\"" >&6	63	echo "${ECHO_T}\"$FIND_PROC\"" >&6
64	@@ -22320,7 +22294,7 @@	64	@@ -12667,8 +12633,8 @@
		65	# Some system specific hacks
		66	#
		67
		68	-MAX_C_OPTIMIZE="-O3"
		69	-MAX_CXX_OPTIMIZE="-O3"
		70	+MAX_C_OPTIMIZE=""
		71	+MAX_CXX_OPTIMIZE=""
		72
		73	case $SYSTEM_TYPE in
		74	solaris2.7)
		75	@@ -22458,7 +22424,7 @@
65	/* ) rel_srcdir="$srcdir" ;;	76	/* ) rel_srcdir="$srcdir" ;;
66	* ) rel_srcdir="../$srcdir" ;;	77	* ) rel_srcdir="../$srcdir" ;;
67	esac	78	esac