Attachment #53984 for bug #81690

Lines 6-13 Link Here

(-)mysql41-server/Makefile (-3 / +6 lines)
6	#	6	#
7		7
8	PORTNAME?= mysql	8	PORTNAME?= mysql
9	PORTVERSION= 4.1.11	9	PORTVERSION= 4.1.12
10	PORTREVISION?= 1	10	PORTREVISION?= 0
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= ${MASTER_SITE_MYSQL}	12	MASTER_SITES= ${MASTER_SITE_MYSQL}
13	MASTER_SITE_SUBDIR= MySQL-4.1	13	MASTER_SITE_SUBDIR= MySQL-4.1
Lines 89-94 Link Here
89		89
90	.if ${OSVERSION} < 500000	90	.if ${OSVERSION} < 500000
91	CXX= ${CC}	91	CXX= ${CC}
		92	LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline
		93	CXXFLAGS+= -I/usr/local/include -L/usr/local/lib
		94	LDFLAGS+= -I/usr/local/include -L/usr/local/lib
92	.endif	95	.endif
93	.if defined(BUILD_OPTIMIZED)	96	.if defined(BUILD_OPTIMIZED)
94	CFLAGS+= -O3 -fno-omit-frame-pointer	97	CFLAGS+= -O3 -fno-omit-frame-pointer
Lines 121-127 Link Here
121	mysqld_safe.1 perror.1 replace.1	124	mysqld_safe.1 perror.1 replace.1
122		125
123	.if !defined(NOPORTDOCS)	126	.if !defined(NOPORTDOCS)
124	PORTDOCS= manual.html manual.txt manual_toc.html	127	PORTDOCS= mysql.info
125	.endif	128	.endif
126		129
127	INFO= mysql	130	INFO= mysql

Lines 1-2 Link Here

(-)mysql41-server/distinfo (-2 / +2 lines)
1	MD5 (mysql-4.1.11.tar.gz) = 0b99001b07cad53f161ec629a6bb24ea	1	MD5 (mysql-4.1.12.tar.gz) = 56a6f5cacd97ae290e07bbe19f279af1
2	SIZE (mysql-4.1.11.tar.gz) = 22880239	2	SIZE (mysql-4.1.12.tar.gz) = 17069350




--- Docs/Makefile.in.orig	Sun Jan  9 12:51:43 2005
+++ Docs/Makefile.in	Sun Jan  9 12:58:11 2005
@@ -316,7 +316,7 @@
 
 SUBDIRS = Images
 GT = $(srcdir)/Support/generate-text-files.pl
-all: $(BUILT_SOURCES)
+all:
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
@@ -626,7 +626,7 @@
 	for dir in "$(DESTDIR)$(infodir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
-install: $(BUILT_SOURCES)
+install:
 	$(MAKE) $(AM_MAKEFLAGS) install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -750,7 +750,7 @@
 	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 
-all:			$(targets) txt_files
+all:
 
 txt_files:		../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt




--- scripts/Makefile.in.orig	Mon May 30 23:32:44 2005
+++ scripts/Makefile.in	Mon May 30 23:34:50 2005
@@ -320,26 +320,7 @@
 vio_dir = @vio_dir@
 vio_libs = @vio_libs@
 zlib_dir = @zlib_dir@

-			make_win_src_distribution \
-			make_win_binary_distribution \
-			mysql_create_system_tables
+bin_SCRIPTS = 
 
 EXTRA_SCRIPTS = make_binary_distribution.sh \
 			make_sharedlib_distribution.sh \
@@ -369,7 +350,7 @@
 			mysqlaccess.conf \
 			mysqlbug
 
-dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
+dist_pkgdata_DATA = 
 
 # mysqlbug should be distributed built so that people can report build
 # failures with it.
@@ -652,8 +633,6 @@
 
 all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
 
-fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
-		./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Return to bug 81690

Lines 1-29 Link Here

(-)mysql41-server/files/patch-Docs::Makefile.in (-29 lines)
1	--- Docs/Makefile.in.orig Sun Jan 9 12:51:43 2005
2	+++ Docs/Makefile.in Sun Jan 9 12:58:11 2005
3	@@ -316,7 +316,7 @@
4
5	SUBDIRS = Images
6	GT = $(srcdir)/Support/generate-text-files.pl
7	-all: $(BUILT_SOURCES)
8	+all:
9	$(MAKE) $(AM_MAKEFLAGS) all-recursive
10
11	.SUFFIXES:
12	@@ -626,7 +626,7 @@
13	for dir in "$(DESTDIR)$(infodir)"; do \
14	test -z "$$dir" \|\| $(mkdir_p) "$$dir"; \
15	done
16	-install: $(BUILT_SOURCES)
17	+install:
18	$(MAKE) $(AM_MAKEFLAGS) install-recursive
19	install-exec: install-exec-recursive
20	install-data: install-data-recursive
21	@@ -750,7 +750,7 @@
22	tags tags-recursive uninstall uninstall-am uninstall-info-am
23
24
25	-all: $(targets) txt_files
26	+all:
27
28	txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
29	INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt

Lines 1-6 Link Here

(-)mysql41-server/files/patch-scripts::Makefile.in (-15 / +6 lines)
1	--- scripts/Makefile.in.orig Tue Dec 14 13:41:31 2004	1	--- scripts/Makefile.in.orig Mon May 30 23:32:44 2005
2	+++ scripts/Makefile.in Sun Dec 19 11:52:42 2004	2	+++ scripts/Makefile.in Mon May 30 23:34:50 2005
3	@@ -316,26 +316,7 @@	3	@@ -320,26 +320,7 @@
4	vio_dir = @vio_dir@	4	vio_dir = @vio_dir@
5	vio_libs = @vio_libs@	5	vio_libs = @vio_libs@
6	zlib_dir = @zlib_dir@	6	zlib_dir = @zlib_dir@
Lines 24-48 Link Here
24	- make_win_src_distribution \	24	- make_win_src_distribution \
25	- make_win_binary_distribution \	25	- make_win_binary_distribution \
26	- mysql_create_system_tables	26	- mysql_create_system_tables
27	+bin_SCRIPTS =	27	+bin_SCRIPTS =
28		28
29	EXTRA_SCRIPTS = make_binary_distribution.sh \	29	EXTRA_SCRIPTS = make_binary_distribution.sh \
30	make_sharedlib_distribution.sh \	30	make_sharedlib_distribution.sh \
31	@@ -366,7 +347,7 @@	31	@@ -369,7 +350,7 @@
32	mysqlaccess.conf \	32	mysqlaccess.conf \
33	mysqlbug	33	mysqlbug
34		34
35	-dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql	35	-dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
36	+dist_pkgdata_DATA =	36	+dist_pkgdata_DATA =
37		37
38	# mysqlbug should be distributed built so that people can report build	38	# mysqlbug should be distributed built so that people can report build
39	# failures with it.	39	# failures with it.
40	@@ -652,8 +633,6 @@
41
42	all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
43
44	-fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
45	- ./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
46	# Tell versions [3.59,3.63) of GNU make to not export all variables.
47	# Otherwise a system limit (for SysV at least) may be exceeded.
48	.NOEXPORT: