aboutsummaryrefslogtreecommitdiff
path: root/net/libnss-mysql
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-09-10 21:50:10 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-09-10 21:50:10 +0000
commit166f8a40ebb8c4cee836a11c33a4d05f48e25edc (patch)
tree932db07e6e6697af6e0fc56c01e3bbf1160603e5 /net/libnss-mysql
parent3081658de5c0a292cdcccf31651294325936a53d (diff)
downloadports-166f8a40ebb8c4cee836a11c33a4d05f48e25edc.tar.gz
ports-166f8a40ebb8c4cee836a11c33a4d05f48e25edc.zip
Notes
Diffstat (limited to 'net/libnss-mysql')
-rw-r--r--net/libnss-mysql/Makefile4
-rw-r--r--net/libnss-mysql/distinfo4
-rw-r--r--net/libnss-mysql/files/patch-Makefile.in13
-rw-r--r--net/libnss-mysql/files/patch-src::mysql.c15
-rw-r--r--net/libnss-mysql/files/patch-src::nss_mysql.h11
5 files changed, 11 insertions, 36 deletions
diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile
index cdb67442a9f2..676b6a77634a 100644
--- a/net/libnss-mysql/Makefile
+++ b/net/libnss-mysql/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libnss-mysql
-PORTVERSION= 1.4
-PORTREVISION= 1
+PORTVERSION= 1.5
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libnss-mysql
@@ -16,6 +15,7 @@ MAINTAINER= vd@datamax.bg
COMMENT= NSS module using a MySQL database for backend
GNU_CONFIGURE= yes
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-mysql-lib=${LOCALBASE}/lib/mysql \
--with-mysql-inc=${LOCALBASE}/include/mysql
INSTALLS_SHLIB= yes
diff --git a/net/libnss-mysql/distinfo b/net/libnss-mysql/distinfo
index 447f239c04e3..e93661943328 100644
--- a/net/libnss-mysql/distinfo
+++ b/net/libnss-mysql/distinfo
@@ -1,2 +1,2 @@
-MD5 (libnss-mysql-1.4.tar.gz) = 262f03df6edc0b5b8f2abc81a619eb6d
-SIZE (libnss-mysql-1.4.tar.gz) = 323660
+MD5 (libnss-mysql-1.5.tar.gz) = a34d41a38e426ba26ffde07d03beef8e
+SIZE (libnss-mysql-1.5.tar.gz) = 333385
diff --git a/net/libnss-mysql/files/patch-Makefile.in b/net/libnss-mysql/files/patch-Makefile.in
index 0dd855f9ea95..67be170fcd09 100644
--- a/net/libnss-mysql/files/patch-Makefile.in
+++ b/net/libnss-mysql/files/patch-Makefile.in
@@ -1,21 +1,22 @@
---- Makefile.in.orig Sat Nov 13 17:22:34 2004
-+++ Makefile.in Sun Nov 14 11:23:31 2004
-@@ -456,16 +456,12 @@
+--- Makefile.in.orig Sun Sep 4 06:34:39 2005
++++ Makefile.in Fri Sep 9 19:39:38 2005
+@@ -617,16 +617,11 @@
install-data-hook:
- @if test ! -f ${DESTDIR}${sysconfdir}/libnss-mysql.cfg; then \
- ${srcdir}/aux/mkinstalldirs ${DESTDIR}${sysconfdir}; \
+- ${srcdir}/aux/mkinstalldirs ${DESTDIR}${sysconfdir}; \
++ ${mkinstalldirs} ${DESTDIR}${sysconfdir}; \
${INSTALL_DATA} ${srcdir}/sample/@OS@/libnss-mysql.cfg \
- ${DESTDIR}${sysconfdir}/libnss-mysql.cfg; \
- fi
- @if test ! -f ${DESTDIR}${sysconfdir}/libnss-mysql-root.cfg; then \
+- ${srcdir}/aux/mkinstalldirs ${DESTDIR}${sysconfdir}; \
+ ${DESTDIR}${sysconfdir}/libnss-mysql.cfg-dist; \
- ${srcdir}/aux/mkinstalldirs ${DESTDIR}${sysconfdir}; \
${INSTALL_DATA} -m 600 ${srcdir}/sample/@OS@/libnss-mysql-root.cfg \
- ${DESTDIR}${sysconfdir}/libnss-mysql-root.cfg; \
- fi
-+ ${DESTDIR}${sysconfdir}/libnss-mysql-root.cfg-dist; \
++ ${DESTDIR}${sysconfdir}/libnss-mysql-root.cfg-dist;
# 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:
diff --git a/net/libnss-mysql/files/patch-src::mysql.c b/net/libnss-mysql/files/patch-src::mysql.c
deleted file mode 100644
index 5b1b3eb1934f..000000000000
--- a/net/libnss-mysql/files/patch-src::mysql.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mysql.c.orig Tue Jun 28 16:05:53 2005
-+++ src/mysql.c Tue Jun 28 16:18:17 2005
-@@ -137,10 +137,11 @@
- _nss_mysql_set_options (sql_server_t *server)
- {
- DN ("_nss_mysql_set_options")
-+ static const unsigned def_timeout = DEF_TIMEOUT;
-
- DENTER
-
-- mysql_options(&ci.link, MYSQL_OPT_CONNECT_TIMEOUT, DEF_TIMEOUT);
-+ mysql_options(&ci.link, MYSQL_OPT_CONNECT_TIMEOUT, &def_timeout);
- mysql_options(&ci.link, MYSQL_READ_DEFAULT_GROUP, "libnss-mysql");
-
- DEXIT
diff --git a/net/libnss-mysql/files/patch-src::nss_mysql.h b/net/libnss-mysql/files/patch-src::nss_mysql.h
deleted file mode 100644
index 05277bbcb1fd..000000000000
--- a/net/libnss-mysql/files/patch-src::nss_mysql.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nss_mysql.h.orig Tue Jun 28 16:06:14 2005
-+++ src/nss_mysql.h Tue Jun 28 16:17:30 2005
-@@ -70,7 +70,7 @@
- #define MAX_QUERY_ATTEMPTS 3 /* # of query retries */
-
- /* Default initializers */
--#define DEF_TIMEOUT "3"
-+#define DEF_TIMEOUT 3
-
- #ifdef DEBUG
- void _nss_mysql_debug (char *fmt, ...);