summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2002-03-30 08:30:29 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2002-03-30 08:30:29 +0000
commit7b0a375e80983a154d5028e8895090734ae9d6ea (patch)
treed02de869191a62b8a0e2be718cfd6d4a8fe1196a
parentAdd PTL-2.1.8_readdir-patch and bump PORTREVISION. (diff)
Properly link these libraries with libiconv.
This should fix some other ports that try to link with the FreeTDS libraries.
Notes
Notes: svn path=/head/; revision=56907
-rw-r--r--databases/freetds-devel/Makefile2
-rw-r--r--databases/freetds-devel/files/patch-iconv-linkage28
-rw-r--r--databases/freetds/Makefile2
-rw-r--r--databases/freetds/files/patch-iconv-linkage28
4 files changed, 58 insertions, 2 deletions
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index f18e65ac52c1..3afcc561e00d 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= freetds
PORTVERSION= 0.53
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/freetds
diff --git a/databases/freetds-devel/files/patch-iconv-linkage b/databases/freetds-devel/files/patch-iconv-linkage
new file mode 100644
index 000000000000..21ea02f658eb
--- /dev/null
+++ b/databases/freetds-devel/files/patch-iconv-linkage
@@ -0,0 +1,28 @@
+--- src/ctlib/Makefile.in.orig Sat Mar 30 17:14:45 2002
++++ src/ctlib/Makefile.in Sat Mar 30 17:15:17 2002
+@@ -104,3 +104,3 @@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(LIBICONV)
+ libct_la_LDFLAGS =
+--- src/dblib/Makefile.in.orig Sat Mar 30 17:14:45 2002
++++ src/dblib/Makefile.in Sat Mar 30 17:15:30 2002
+@@ -105,3 +105,3 @@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(LIBICONV)
+ libsybdb_la_DEPENDENCIES = $(patsubst %, $(TDSDIR)/%, $(patsubst %.c, \
+--- src/odbc/Makefile.in.orig Sat Mar 30 17:14:45 2002
++++ src/odbc/Makefile.in Sat Mar 30 17:15:50 2002
+@@ -103,3 +103,3 @@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(LIBICONV)
+ libtdsodbc_la_LDFLAGS =
+--- src/tds/Makefile.in.orig Sat Mar 30 17:14:45 2002
++++ src/tds/Makefile.in Sat Mar 30 17:16:42 2002
+@@ -90,3 +90,3 @@
+ INCLUDES = -I$(top_srcdir)/include
+-LIBS = @LIBICONV@
++LIBS = @LIBICONV@ $(LIBICONV)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index f18e65ac52c1..3afcc561e00d 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -6,7 +6,7 @@
PORTNAME= freetds
PORTVERSION= 0.53
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/freetds
diff --git a/databases/freetds/files/patch-iconv-linkage b/databases/freetds/files/patch-iconv-linkage
new file mode 100644
index 000000000000..21ea02f658eb
--- /dev/null
+++ b/databases/freetds/files/patch-iconv-linkage
@@ -0,0 +1,28 @@
+--- src/ctlib/Makefile.in.orig Sat Mar 30 17:14:45 2002
++++ src/ctlib/Makefile.in Sat Mar 30 17:15:17 2002
+@@ -104,3 +104,3 @@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(LIBICONV)
+ libct_la_LDFLAGS =
+--- src/dblib/Makefile.in.orig Sat Mar 30 17:14:45 2002
++++ src/dblib/Makefile.in Sat Mar 30 17:15:30 2002
+@@ -105,3 +105,3 @@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(LIBICONV)
+ libsybdb_la_DEPENDENCIES = $(patsubst %, $(TDSDIR)/%, $(patsubst %.c, \
+--- src/odbc/Makefile.in.orig Sat Mar 30 17:14:45 2002
++++ src/odbc/Makefile.in Sat Mar 30 17:15:50 2002
+@@ -103,3 +103,3 @@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(LIBICONV)
+ libtdsodbc_la_LDFLAGS =
+--- src/tds/Makefile.in.orig Sat Mar 30 17:14:45 2002
++++ src/tds/Makefile.in Sat Mar 30 17:16:42 2002
+@@ -90,3 +90,3 @@
+ INCLUDES = -I$(top_srcdir)/include
+-LIBS = @LIBICONV@
++LIBS = @LIBICONV@ $(LIBICONV)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs