sync with freetds

This commit is contained in:
jcs 2004-02-16 18:18:25 +00:00
parent eb493fb118
commit 67d0759552
4 changed files with 9 additions and 8 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.11 2004/01/17 15:58:07 naddy Exp $ # $OpenBSD: Makefile,v 1.12 2004/02/16 18:18:43 jcs Exp $
DISTNAME= sybperl-2.16 DISTNAME= sybperl-2.16
PKGNAME= p5-${DISTNAME} PKGNAME= p5-${DISTNAME}p0
CATEGORIES= databases perl5 CATEGORIES= databases perl5
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-CTlib_Makefile_PL,v 1.2 2002/10/31 01:32:08 jcs Exp $ $OpenBSD: patch-CTlib_Makefile_PL,v 1.3 2004/02/16 18:18:43 jcs Exp $
--- CTlib/Makefile.PL.orig Tue Oct 22 12:59:28 2002 --- CTlib/Makefile.PL.orig Tue Oct 22 12:59:28 2002
+++ CTlib/Makefile.PL Wed Oct 30 09:17:13 2002 +++ CTlib/Makefile.PL Wed Oct 30 09:17:13 2002
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-CTlib_Makefile_PL,v 1.2 2002/10/31 01:32:08 jcs Exp $
$inc_string = "-I$SYBASE/include"; $inc_string = "-I$SYBASE/include";
$def_string = "-DCTLIBVS=$CTLIBVS -DSYBPLVER='\"\${VERSION}\"' $$sattr{EXTRA_DEFS}"; $def_string = "-DCTLIBVS=$CTLIBVS -DSYBPLVER='\"\${VERSION}\"' $$sattr{EXTRA_DEFS}";
- $lib_string = "-L$SYBASE/lib -lct -lcs -ltcl -lcomn -lintl -lblk"; - $lib_string = "-L$SYBASE/lib -lct -lcs -ltcl -lcomn -lintl -lblk";
+ $lib_string = "-L$SYBASE/lib -lct -ltds -lintl"; + $lib_string = "-L$SYBASE/lib -lct -ltds -liconv -lintl";
# Linux uses libsybtcl instead of libtcl to avoid conflicts with tcl/tk # Linux uses libsybtcl instead of libtcl to avoid conflicts with tcl/tk
if(-e "$SYBASE/lib/libsybtcl$Config{lib_ext}" || if(-e "$SYBASE/lib/libsybtcl$Config{lib_ext}" ||

View File

@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.9 2003/05/12 18:02:44 sturm Exp $ # $OpenBSD: Makefile,v 1.10 2004/02/16 18:18:25 jcs Exp $
DISTNAME= sqsh-2.1 DISTNAME= sqsh-2.1
PKGNAME= ${DISTNAME}p0
CATEGORIES= databases shells CATEGORIES= databases shells
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
@ -16,7 +17,7 @@ EXTRACT_SUFX= -src.tar.gz
MAINTAINER= Joshua Stein <jcs@rt.fm> MAINTAINER= Joshua Stein <jcs@rt.fm>
MODULES= gettext MODULES= gettext
LIB_DEPENDS= tds.0,ct.0::databases/freetds LIB_DEPENDS= tds.3,ct.2::databases/freetds
CONFIGURE_STYLE= gnu old CONFIGURE_STYLE= gnu old
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.2 2001/12/23 23:27:23 jcs Exp $ $OpenBSD: patch-configure,v 1.3 2004/02/16 18:18:25 jcs Exp $
--- configure.orig Sun Dec 23 16:40:32 2001 --- configure.orig Sun Dec 23 16:40:32 2001
+++ configure Sun Dec 23 16:41:14 2001 +++ configure Sun Dec 23 16:41:14 2001
@@ -1209,6 +1209,8 @@ @@ -1209,6 +1209,8 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-configure,v 1.2 2001/12/23 23:27:23 jcs Exp $
aix*) aix*)
SYBASE_OS="-lm";; SYBASE_OS="-lm";;
+ openbsd*) + openbsd*)
+ SYBASE_OS="-lm";; + SYBASE_OS="-lm -liconv";;
*) *)
SYBASE_OS="-lm -ldl";; SYBASE_OS="-lm -ldl";;
esac esac