Attachment #28510 for bug #47902

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

Lines 6-12 Link Here

(-)mysql40-server/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME?= mysql	8	PORTNAME?= mysql
9	PORTVERSION= 4.0.9	9	PORTVERSION= 4.0.10
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://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
Lines 88-94 Link Here
88		88
89	PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma	89	PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-gamma
90		90
91	ONLY_FOR_ARCHS= i386 alpha	91	ONLY_FOR_ARCHS= i386 alpha sparc64
92		92
93	DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \	93	DOCS= manual.html manual.ps manual_toc.html manual.txt manual.texi \
94	include.texi	94	include.texi

Line 1 Link Here

(-)mysql40-server/distinfo (-1 / +1 lines)
1	MD5 (mysql-4.0.9-gamma.tar.gz) = 75d582f3e71e21cd6ffa7c84a6db26c3	1	MD5 (mysql-4.0.10-gamma.tar.gz) = fd66e12e7de57a6836283365107af427




--- Makefile.in.orig	Tue Feb  4 13:55:10 2003
+++ Makefile.in	Tue Feb  4 13:58:31 2003
@@ -210,13 +210,11 @@
 EXTRA_DIST = INSTALL-SOURCE README \
 			COPYING COPYING.LIB
 
-SUBDIRS = . include @docs_dirs@ @readline_dir@ \
-			@thread_dirs@ pstack @sql_client_dirs@ \
-			@sql_server_dirs@ scripts man tests \
-			BUILD netware os2 @libmysqld_dirs@ \
-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@ \
-			@platform_dir@
-
+.if defined(CLIENT_ONLY)
+SUBDIRS = include @sql_client_dirs@ tests man




--- configure.orig	Wed Jan 29 12:29:38 2003
+++ configure	Tue Feb  4 14:07:39 2003
@@ -8104,6 +8104,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'
@@ -9046,7 +9047,7 @@
   ;;
 esac
 fi

 
 if test -n "$HOSTNAME"; then
   echo "$as_me:$LINENO: result: $HOSTNAME" >&5
@@ -9238,43 +9239,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
-# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
-# Solaris
-elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
 # BSD style
-elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
-then
   FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
-# SysV style
-elif $PS -ef 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"
-# Do anybody use this?
-elif $PS $$ 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
-else
-  case $SYSTEM_TYPE in
-    *darwin*)
-      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
-      ;;
-    *cygwin*)
-      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
-      ;;
-    *netware* | *modesto*)
-      FIND_PROC=
-      ;;
-    *)
-      { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
-echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
-   { (exit 1); exit 1; }; }
-  esac
-fi
 
 echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
 echo "${ECHO_T}\"$FIND_PROC\"" >&6

Return to bug 47902

Lines 1-14 Link Here

(-)mysql40-server/files/patch-Makefile.in (-7 / +8 lines)
1	--- Makefile.in.orig Wed Nov 20 00:06:37 2002	1	--- Makefile.in.orig Tue Feb 4 13:55:10 2003
2	+++ Makefile.in Wed Nov 20 00:07:31 2002	2	+++ Makefile.in Tue Feb 4 13:58:31 2003
3	@@ -207,12 +207,11 @@	3	@@ -210,13 +210,11 @@
4	EXTRA_DIST = INSTALL-SOURCE README \	4	EXTRA_DIST = INSTALL-SOURCE README \
5	COPYING COPYING.LIB	5	COPYING COPYING.LIB
6		6
7	-SUBDIRS = include @docs_dirs@ @readline_dir@ \	7	-SUBDIRS = . include @docs_dirs@ @readline_dir@ \
8	- @thread_dirs@ pstack @sql_client_dirs@ \	8	- @thread_dirs@ pstack @sql_client_dirs@ \
9	- @sql_server_dirs@ @libmysqld_dirs@ scripts man \	9	- @sql_server_dirs@ scripts man tests \
10	- tests BUILD os2 \	10	- BUILD netware os2 @libmysqld_dirs@ \
11	- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@	11	- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ \
		12	- @platform_dir@
12	-	13	-
13	+.if defined(CLIENT_ONLY)	14	+.if defined(CLIENT_ONLY)
14	+SUBDIRS = include @sql_client_dirs@ tests man	15	+SUBDIRS = include @sql_client_dirs@ tests man

Lines 1-6 Link Here

(-)mysql40-server/files/patch-configure (-4 / +48 lines)
1	--- configure.orig Mon Dec 16 10:12:16 2002	1	--- configure.orig Wed Jan 29 12:29:38 2003
2	+++ configure Fri Dec 20 18:11:14 2002	2	+++ configure Tue Feb 4 14:07:39 2003
3	@@ -8071,6 +8071,7 @@	3	@@ -8104,6 +8104,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	@@ -9000,7 +9001,7 @@	11	@@ -9046,7 +9047,7 @@
12	;;	12	;;
13	esac	13	esac
14	fi	14	fi
Lines 17-19 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	@@ -9238,43 +9239,8 @@
		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
		23	PS=$ac_cv_path_PS
		24	-# Linux style
		25	-if $PS p $$ 2> /dev/null \| grep $0 > /dev/null
		26	-then
		27	- FIND_PROC="$PS p \$\$PID \| grep mysqld > /dev/null"
		28	-# Solaris
		29	-elif $PS -p $$ 2> /dev/null \| grep $0 > /dev/null
		30	-then
		31	- FIND_PROC="$PS -p \$\$PID \| grep mysqld > /dev/null"
		32	# BSD style
		33	-elif $PS -uaxww 2> /dev/null \| grep $0 > /dev/null
		34	-then
		35	FIND_PROC="$PS -uaxww \| grep mysqld \| grep \" \$\$PID \" > /dev/null"
		36	-# SysV style
		37	-elif $PS -ef 2> /dev/null \| grep $0 > /dev/null
		38	-then
		39	- FIND_PROC="$PS -ef \| grep mysqld \| grep \" \$\$PID \" > /dev/null"
		40	-# Do anybody use this?
		41	-elif $PS $$ 2> /dev/null \| grep $0 > /dev/null
		42	-then
		43	- FIND_PROC="$PS \$\$PID \| grep mysqld > /dev/null"
		44	-else
		45	- case $SYSTEM_TYPE in
		46	- darwin)
		47	- FIND_PROC="$PS -uaxww \| grep mysqld \| grep \" \$\$PID \" > /dev/null"
		48	- ;;
		49	- cygwin)
		50	- FIND_PROC="$PS -e \| grep mysqld \| grep \" \$\$PID \" > /dev/null"
		51	- ;;
		52	- netware \| modesto)
		53	- FIND_PROC=
		54	- ;;
		55	- *)
		56	- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
		57	-echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
		58	- { (exit 1); exit 1; }; }
		59	- esac
		60	-fi
		61
		62	echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
		63	echo "${ECHO_T}\"$FIND_PROC\"" >&6