mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-11 07:22:22 +00:00
Remove the temporary hack to use the new USE_LDCONFIG feature.
This commit is contained in:
parent
28d82d75a1
commit
fcfd4c734b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=166022
@ -153,10 +153,7 @@ CONFLICTS= mysql-client-4.* mysql-client-5.*
|
||||
|
||||
MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
|
||||
|
||||
INSTALLS_SHLIB= yes
|
||||
LDCONFIG_DIRS= %%PREFIX%%/lib/mysql
|
||||
USE_LDCONFIG= ${PREFIX}/lib/mysql
|
||||
.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
|
||||
|
||||
CONFIGURE_ARGS+=--without-server
|
||||
|
||||
@ -166,8 +163,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
|
||||
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
@ -147,10 +147,7 @@ CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.*
|
||||
|
||||
MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
|
||||
|
||||
INSTALLS_SHLIB= yes
|
||||
LDCONFIG_DIRS= %%PREFIX%%/lib/mysql
|
||||
USE_LDCONFIG= ${PREFIX}/lib/mysql
|
||||
.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
|
||||
|
||||
CONFIGURE_ARGS+=--without-server
|
||||
|
||||
@ -163,8 +160,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
|
||||
.endif
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
@ -168,10 +168,7 @@ CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
|
||||
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
|
||||
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
|
||||
|
||||
INSTALLS_SHLIB= yes
|
||||
LDCONFIG_DIRS= %%PREFIX%%/lib/mysql
|
||||
USE_LDCONFIG= ${PREFIX}/lib/mysql
|
||||
.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
|
||||
|
||||
CONFIGURE_ARGS+=--without-server
|
||||
|
||||
@ -187,8 +184,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
|
||||
.endif
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
@ -177,10 +177,7 @@ CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.1.*
|
||||
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
|
||||
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
|
||||
|
||||
INSTALLS_SHLIB= yes
|
||||
LDCONFIG_DIRS= %%PREFIX%%/lib/mysql
|
||||
USE_LDCONFIG= ${PREFIX}/lib/mysql
|
||||
.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
|
||||
|
||||
CONFIGURE_ARGS+=--without-server
|
||||
|
||||
@ -203,8 +200,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
|
||||
.endif
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
@ -188,8 +188,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
|
||||
.endif
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
@ -188,8 +188,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
|
||||
.endif
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
@ -188,8 +188,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
|
||||
.endif
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
@ -188,8 +188,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
|
||||
.endif
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
@ -188,8 +188,6 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
|
||||
.endif
|
||||
|
||||
post-install: install-ldconfig-file
|
||||
|
||||
.else
|
||||
# MySQL-Scripts part
|
||||
USE_MYSQL= yes
|
||||
|
Loading…
Reference in New Issue
Block a user