Remove the temporary hack to use the new USE_LDCONFIG feature.

9 files changed, 0 insertions, 30 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 6cc9c311..3624cc9 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -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
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 0a42738..29da853 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -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
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 3c01fdf..2573195 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -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
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 39112be..35c6f52 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -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
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 343d073..f1ab62c 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -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
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 343d073..f1ab62c 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -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
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 343d073..f1ab62c 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -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
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 343d073..f1ab62c 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -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
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 343d073..f1ab62c 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -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