mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
Really fix includes.
This commit is contained in:
Alex Dupre
parent
80a0e36077
commit
31da751ef4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=258338
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME?= mysql
|
||||
PORTVERSION= 5.5.5
|
||||
PORTREVISION?= 0
|
||||
PORTREVISION?= 1
|
||||
CATEGORIES= databases ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_MYSQL}
|
||||
MASTER_SITE_SUBDIR= MySQL-5.5
|
||||
@ -175,9 +175,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
|
||||
|
||||
post-install:
|
||||
@${MKDIR} ${PREFIX}/include/mysql/psi
|
||||
@${MV} ${PREFIX}/include/mysql/mysql_thread.h ${PREFIX}/include/mysql/psi/mysql_thread.h
|
||||
@${MV} ${PREFIX}/include/mysql/psi.h ${PREFIX}/include/mysql/psi/psi.h
|
||||
${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
|
||||
|
||||
.else
|
||||
|
||||
@ -1,6 +1,22 @@
|
||||
--- include/Makefile.in.orig 2010-07-16 10:14:39.000000000 +0200
|
||||
+++ include/Makefile.in 2010-07-16 10:14:51.000000000 +0200
|
||||
@@ -708,8 +708,6 @@
|
||||
--- include/Makefile.in.orig 2010-07-27 16:46:08.000000000 +0200
|
||||
+++ include/Makefile.in 2010-07-27 16:48:45.000000000 +0200
|
||||
@@ -480,12 +480,11 @@
|
||||
-rm -rf .libs _libs
|
||||
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
|
||||
@$(NORMAL_INSTALL)
|
||||
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
|
||||
+ test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)/mysql/psi"
|
||||
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
|
||||
- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
|
||||
+ echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$p'"; \
|
||||
+ $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$p"; \
|
||||
done
|
||||
|
||||
uninstall-pkgincludeHEADERS:
|
||||
@@ -708,8 +707,6 @@
|
||||
@HAVE_DTRACE_TRUE@probes_mysql_dtrace.h: $(DTRACEPROVIDER)
|
||||
@HAVE_DTRACE_TRUE@ $(DTRACE) $(DTRACEFLAGS) -h -s $(DTRACEPROVIDER) -o $@
|
||||
|
||||
|
||||
@ -28,24 +28,24 @@ include/mysql/my_no_pthread.h
|
||||
include/mysql/my_pthread.h
|
||||
include/mysql/my_sys.h
|
||||
include/mysql/my_xml.h
|
||||
include/mysql/mysql/plugin_audit.h
|
||||
include/mysql/mysql/plugin_ftparser.h
|
||||
include/mysql/mysql/plugin.h
|
||||
include/mysql/mysql/psi/mysql_file.h
|
||||
include/mysql/mysql/psi/mysql_thread.h
|
||||
include/mysql/mysql/psi/psi.h
|
||||
include/mysql/mysql/services.h
|
||||
include/mysql/mysql/service_my_snprintf.h
|
||||
include/mysql/mysql/service_thd_alloc.h
|
||||
include/mysql/mysql.h
|
||||
include/mysql/mysql_com.h
|
||||
include/mysql/mysql_embed.h
|
||||
include/mysql/mysql_file.h
|
||||
include/mysql/mysql_time.h
|
||||
include/mysql/mysql_version.h
|
||||
include/mysql/mysqld_ername.h
|
||||
include/mysql/mysqld_error.h
|
||||
include/mysql/plugin.h
|
||||
include/mysql/plugin_audit.h
|
||||
include/mysql/plugin_ftparser.h
|
||||
include/mysql/probes_mysql.h
|
||||
include/mysql/probes_mysql_nodtrace.h
|
||||
include/mysql/psi/mysql_thread.h
|
||||
include/mysql/psi/psi.h
|
||||
include/mysql/services.h
|
||||
include/mysql/service_my_snprintf.h
|
||||
include/mysql/service_thd_alloc.h
|
||||
include/mysql/sql_common.h
|
||||
include/mysql/sql_state.h
|
||||
include/mysql/sslopt-case.h
|
||||
@ -61,7 +61,8 @@ lib/mysql/libmysqlclient_r.la
|
||||
lib/mysql/libmysqlclient_r.so
|
||||
lib/mysql/libmysqlclient_r.so.16
|
||||
share/aclocal/mysql.m4
|
||||
@dirrm include/mysql/psi
|
||||
@dirrm include/mysql/mysql/psi
|
||||
@dirrm include/mysql/mysql
|
||||
@dirrm include/mysql
|
||||
@dirrm lib/mysql
|
||||
@dirrmtry %%DATADIR%%
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME?= mysql
|
||||
PORTVERSION= 5.5.5
|
||||
PORTREVISION?= 0
|
||||
PORTREVISION?= 1
|
||||
CATEGORIES= databases ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_MYSQL}
|
||||
MASTER_SITE_SUBDIR= MySQL-5.5
|
||||
@ -175,9 +175,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
|
||||
|
||||
post-install:
|
||||
@${MKDIR} ${PREFIX}/include/mysql/psi
|
||||
@${MV} ${PREFIX}/include/mysql/mysql_thread.h ${PREFIX}/include/mysql/psi/mysql_thread.h
|
||||
@${MV} ${PREFIX}/include/mysql/psi.h ${PREFIX}/include/mysql/psi/psi.h
|
||||
${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
|
||||
|
||||
.else
|
||||
|
||||
@ -1,6 +1,22 @@
|
||||
--- include/Makefile.in.orig 2010-07-16 10:14:39.000000000 +0200
|
||||
+++ include/Makefile.in 2010-07-16 10:14:51.000000000 +0200
|
||||
@@ -708,8 +708,6 @@
|
||||
--- include/Makefile.in.orig 2010-07-27 16:46:08.000000000 +0200
|
||||
+++ include/Makefile.in 2010-07-27 16:48:45.000000000 +0200
|
||||
@@ -480,12 +480,11 @@
|
||||
-rm -rf .libs _libs
|
||||
install-pkgincludeHEADERS: $(pkginclude_HEADERS)
|
||||
@$(NORMAL_INSTALL)
|
||||
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
|
||||
+ test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)/mysql/psi"
|
||||
@list='$(pkginclude_HEADERS)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
|
||||
- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
|
||||
+ echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$p'"; \
|
||||
+ $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$p"; \
|
||||
done
|
||||
|
||||
uninstall-pkgincludeHEADERS:
|
||||
@@ -708,8 +707,6 @@
|
||||
@HAVE_DTRACE_TRUE@probes_mysql_dtrace.h: $(DTRACEPROVIDER)
|
||||
@HAVE_DTRACE_TRUE@ $(DTRACE) $(DTRACEFLAGS) -h -s $(DTRACEPROVIDER) -o $@
|
||||
|
||||
|
||||
@ -28,24 +28,24 @@ include/mysql/my_no_pthread.h
|
||||
include/mysql/my_pthread.h
|
||||
include/mysql/my_sys.h
|
||||
include/mysql/my_xml.h
|
||||
include/mysql/mysql/plugin_audit.h
|
||||
include/mysql/mysql/plugin_ftparser.h
|
||||
include/mysql/mysql/plugin.h
|
||||
include/mysql/mysql/psi/mysql_file.h
|
||||
include/mysql/mysql/psi/mysql_thread.h
|
||||
include/mysql/mysql/psi/psi.h
|
||||
include/mysql/mysql/services.h
|
||||
include/mysql/mysql/service_my_snprintf.h
|
||||
include/mysql/mysql/service_thd_alloc.h
|
||||
include/mysql/mysql.h
|
||||
include/mysql/mysql_com.h
|
||||
include/mysql/mysql_embed.h
|
||||
include/mysql/mysql_file.h
|
||||
include/mysql/mysql_time.h
|
||||
include/mysql/mysql_version.h
|
||||
include/mysql/mysqld_ername.h
|
||||
include/mysql/mysqld_error.h
|
||||
include/mysql/plugin.h
|
||||
include/mysql/plugin_audit.h
|
||||
include/mysql/plugin_ftparser.h
|
||||
include/mysql/probes_mysql.h
|
||||
include/mysql/probes_mysql_nodtrace.h
|
||||
include/mysql/psi/mysql_thread.h
|
||||
include/mysql/psi/psi.h
|
||||
include/mysql/services.h
|
||||
include/mysql/service_my_snprintf.h
|
||||
include/mysql/service_thd_alloc.h
|
||||
include/mysql/sql_common.h
|
||||
include/mysql/sql_state.h
|
||||
include/mysql/sslopt-case.h
|
||||
@ -61,7 +61,8 @@ lib/mysql/libmysqlclient_r.la
|
||||
lib/mysql/libmysqlclient_r.so
|
||||
lib/mysql/libmysqlclient_r.so.16
|
||||
share/aclocal/mysql.m4
|
||||
@dirrm include/mysql/psi
|
||||
@dirrm include/mysql/mysql/psi
|
||||
@dirrm include/mysql/mysql
|
||||
@dirrm include/mysql
|
||||
@dirrm lib/mysql
|
||||
@dirrmtry %%DATADIR%%
|
||||
|
||||
Loading…
Reference in New Issue
Block a user