Attachment #25070 for bug #42735

View | Details | Raw Unified | Return to bug 42735
Collapse All | Expand All

Lines 5-12 Link Here

(-)databases/freetds/Makefile (-8 / +8 lines)
5	# $FreeBSD: ports/databases/freetds/Makefile,v 1.22 2002/09/01 16:07:46 dwcjr Exp $	5	# $FreeBSD: ports/databases/freetds/Makefile,v 1.22 2002/09/01 16:07:46 dwcjr Exp $
6		6
7	PORTNAME= freetds	7	PORTNAME= freetds
8	PORTVERSION= 0.53	8	PORTVERSION= 0.60
9	PORTREVISION= 2
10	CATEGORIES= databases	9	CATEGORIES= databases
11	MASTER_SITES= ${MASTER_SITE_SUNSITE}	10	MASTER_SITES= ${MASTER_SITE_SUNSITE}
12	MASTER_SITE_SUBDIR= ALPHA/freetds	11	MASTER_SITE_SUBDIR= ALPHA/freetds
Lines 16-29 Link Here
16		15
17	LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv	16	LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
18		17
19	USE_GMAKE= yes
20	GNU_CONFIGURE= yes
21	USE_REINPLACE= yes	18	USE_REINPLACE= yes
		19	USE_GMAKE= yes
		20	USE_LIBTOOL= yes
22	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	21	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
23	LDFLAGS="-L${LOCALBASE}/lib"	22	LDFLAGS="-L${LOCALBASE}/lib"
24	CONFIGURE_ARGS= --with-tdsver=4.2	23	CONFIGURE_ARGS= --with-tdsver=4.2
25	INSTALLS_SHLIB= yes	24	INSTALLS_SHLIB= yes
26		25
		26	MAN1= freebcp.1 tsql.1
		27
27	.if defined(WITH_IODBC)	28	.if defined(WITH_IODBC)
28	LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc	29	LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc
29	CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE}	30	CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE}
Lines 35-52 Link Here
35	.endif	36	.endif
36		37
37	.if defined(WITH_IODBC) \|\| defined(WITH_UNIXODBC)	38	.if defined(WITH_IODBC) \|\| defined(WITH_UNIXODBC)
38	USE_GNOMENG= yes
39	USE_GNOME= glib12
40	PLIST_SUB+= ODBC=""	39	PLIST_SUB+= ODBC=""
41	.else	40	.else
42	PLIST_SUB+= ODBC="@comment "	41	PLIST_SUB+= ODBC="@comment "
43	.endif	42	.endif
44		43
		44	post-extract:
		45	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
		46
45	post-patch:	47	post-patch:
46	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \	48	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
47	's\|/freetds.conf\|/freetds.conf.dist\|g ; \	49	's\|/freetds.conf\|/freetds.conf.dist\|g ; \
48	s\|glib-config\|$$(GLIB_CONFIG)\|g ; \
49	s\|-lglib\|`$$(GLIB_CONFIG) --libs glib`\|g ; \
50	s\| common.h\|\|g'	50	s\| common.h\|\|g'
51		51
52	post-install:	52	post-install:

Line 1 Link Here

(-)databases/freetds/distinfo (-1 / +1 lines)
1	MD5 (freetds-0.53.tgz) = 78586f3db87f53a8097d7665a4d8f892	1	MD5 (freetds-0.60.tgz) = bf719c9e1a5f8cd080dec6f9664e7f44

Lines 1-11 Link Here

(-)databases/freetds/files/patch-ab (-11 lines)
1	--- src/tds/config.c Tue Jun 19 05:22:00 2001
2	+++ src/tds/config.c.new Thu Jul 12 09:49:08 2001
3	@@ -609,7 +609,7 @@
4	char *sybase = getenv("SYBASE");
5	if (sybase!=NULL && sybase[0]!='\0')
6	{
7	- search_interface_file(sybase, "interfaces", server, ip_addr, ip_port, tds_ver);
8	+ search_interface_file(sybase, "etc/freetds/interfaces", server, ip_addr, ip_port, tds_ver);
9	} else {
10	search_interface_file("/etc/freetds", "interfaces", server, ip_addr, ip_port, tds_ver);
11	}




--- configure.orig	Thu Sep 12 01:35:52 2002
+++ configure	Fri Sep 13 20:20:20 2002
@@ -2241,7 +2241,8 @@
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'




--- 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




--- ltmain.sh.orig	Mon Dec 17 00:39:30 2001
+++ ltmain.sh	Sun Dec 23 15:21:53 2001
@@ -2408,6 +2408,9 @@
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
+	  *-*-freebsd*)
+	    # FreeBSD doesn't need this...
+	    ;;
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
@@ -4175,10 +4178,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false; then
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
 	$show "$install_prog $instname $destdir/$name"
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Lines 1-6 Link Here

(-)databases/freetds/pkg-plist (+4 lines)
		1	bin/freebcp
		2	bin/tsql
1	@unexec if cmp -s %D/etc/freetds.conf.dist %D/etc/freetds.conf; then rm -f %D/etc/freetds.conf; fi	3	@unexec if cmp -s %D/etc/freetds.conf.dist %D/etc/freetds.conf; then rm -f %D/etc/freetds.conf; fi
2	etc/freetds.conf.dist	4	etc/freetds.conf.dist
3	@exec if [ ! -f %D/etc/freetds.conf ]; then cp %D/etc/%f %D/etc/freetds.conf; fi	5	@exec if [ ! -f %D/etc/freetds.conf ]; then cp %D/etc/%f %D/etc/freetds.conf; fi
		6	etc/locales.conf
4	etc/freetds/interfaces	7	etc/freetds/interfaces
5	include/bkpublic.h	8	include/bkpublic.h
6	include/cspublic.h	9	include/cspublic.h
Lines 8-13 Link Here
8	include/ctlib.h	11	include/ctlib.h
9	include/ctpublic.h	12	include/ctpublic.h
10	include/dblib.h	13	include/dblib.h
		14	include/freebcp.h
11	include/sqldb.h	15	include/sqldb.h
12	include/sqlfront.h	16	include/sqlfront.h
13	include/sybdb.h	17	include/sybdb.h

Return to bug 42735

Line 0 Link Here

(-)databases/freetds/files/patch-configure (+12 lines)
	1	--- configure.orig Thu Sep 12 01:35:52 2002
	2	+++ configure Fri Sep 13 20:20:20 2002
	3	@@ -2241,7 +2241,8 @@
	4
	5
	6	# This can be used to rebuild libtool when needed
	7	-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
	8	+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
	9	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
	10
	11	# Always use our own libtool.
	12	LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Lines 1-28 Link Here

(-)databases/freetds/files/patch-iconv-linkage (-28 lines)
1	--- src/ctlib/Makefile.in.orig Sat Mar 30 17:14:45 2002
2	+++ src/ctlib/Makefile.in Sat Mar 30 17:15:17 2002
3	@@ -104,3 +104,3 @@
4	LDFLAGS = @LDFLAGS@
5	-LIBS = @LIBS@
6	+LIBS = @LIBS@ $(LIBICONV)
7	libct_la_LDFLAGS =
8	--- src/dblib/Makefile.in.orig Sat Mar 30 17:14:45 2002
9	+++ src/dblib/Makefile.in Sat Mar 30 17:15:30 2002
10	@@ -105,3 +105,3 @@
11	LDFLAGS = @LDFLAGS@
12	-LIBS = @LIBS@
13	+LIBS = @LIBS@ $(LIBICONV)
14	libsybdb_la_DEPENDENCIES = $(patsubst %, $(TDSDIR)/%, $(patsubst %.c, \
15	--- src/odbc/Makefile.in.orig Sat Mar 30 17:14:45 2002
16	+++ src/odbc/Makefile.in Sat Mar 30 17:15:50 2002
17	@@ -103,3 +103,3 @@
18	LDFLAGS = @LDFLAGS@
19	-LIBS = @LIBS@
20	+LIBS = @LIBS@ $(LIBICONV)
21	libtdsodbc_la_LDFLAGS =
22	--- src/tds/Makefile.in.orig Sat Mar 30 17:14:45 2002
23	+++ src/tds/Makefile.in Sat Mar 30 17:16:42 2002
24	@@ -90,3 +90,3 @@
25	INCLUDES = -I$(top_srcdir)/include
26	-LIBS = @LIBICONV@
27	+LIBS = @LIBICONV@ $(LIBICONV)
28	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Lines 1-25 Link Here

(-)databases/freetds/files/patch-ltmain.sh (-25 lines)
1	--- ltmain.sh.orig Mon Dec 17 00:39:30 2001
2	+++ ltmain.sh Sun Dec 23 15:21:53 2001
3	@@ -2408,6 +2408,9 @@
4	--netbsd*)
5	# Don't link with libc until the a.out ld.so is fixed.
6	;;
7	+ --freebsd*)
8	+ # FreeBSD doesn't need this...
9	+ ;;
10	*)
11	# Add libc to deplibs on all other systems if necessary.
12	if test "$build_libtool_need_lc" = "yes"; then
13	@@ -4175,10 +4178,12 @@
14	fi
15
16	# Install the pseudo-library for information purposes.
17	+ if /usr/bin/false; then
18	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
19	instname="$dir/$name"i
20	$show "$install_prog $instname $destdir/$name"
21	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
22	+ fi
23
24	# Maybe install the static library, too.
25	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"