Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/databases/sqsh/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/databases/sqsh/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.8
retrieving revision 1.19
diff -u -p -r1.8 -r1.19
--- pkgsrc/databases/sqsh/Makefile	2001/06/11 02:05:09	1.8
+++ pkgsrc/databases/sqsh/Makefile	2004/03/29 01:50:39	1.19
@@ -1,30 +1,51 @@
-# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/29 01:50:39 grant Exp $
 
 DISTNAME=	sqsh-1.7-src
 PKGNAME=	sqsh-1.7
-WRKSRC=		${WRKDIR}/${PKGNAME}
+PKGREVISION=	2
 CATEGORIES=	databases
-MASTER_SITES=	http://www.voicenet.com/~gray/
+MASTER_SITES=	${HOMEPAGE}
 
-MAINTAINER=	tsarna@netbsd.org
-HOMEPAGE=	http://www.voicenet.com/~gray/sqsh.html
+MAINTAINER=	tsarna@NetBSD.org
+HOMEPAGE=	http://www.sqsh.org/
 COMMENT=	Sybase SQL shell
 
-DEPENDS+=       freetds>=0.50:../../databases/freetds
-
-ALL_TARGET=	sqsh
-INSTALL_TARGET=	install install.man
+ALL_TARGET=		sqsh
+INSTALL_TARGET=		install install.man
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-readline
-CONFIGURE_ENV+=		SYBASE="${SYBASE}"
-
-SYBASE=			${PREFIX}/freetds
-LDFLAGS+=		-Wl,-R${SYBASE}/lib
-
-.include "../../devel/readline/buildlink.mk"
 
-CONFIGURE_ENV+=		INCDIRS="${BUILDLINK_DIR}/include"
-CONFIGURE_ENV+=		LIBDIRS="${BUILDLINK_DIR}/lib"
+# support for the native Sybase Open Client
+BUILD_DEFS+=		USE_SYBASE_OPENCLIENT
+BUILD_DEFS+=		SYBASE
+.if defined(USE_SYBASE_OPENCLIENT) && empty(USE_SYBASE_OPENCLIENT:M[Nn][Oo])
+.  if defined(SYBASE) && exists(${SYBASE}/lib/libct.so)
+BUILDLINK_PASSTHRU_DIRS=${SYBASE}
+_SYBASE=		${SYBASE}
+.  else
+PKG_FAIL_REASON+=	"You must define SYBASE to the base directory of Open Client."
+.  endif
+.else
+_SYBASE=		${BUILDLINK_PREFIX.freetds}/freetds
+MAKE_FLAGS+=		SYBASE_LIBS=-lct
+.endif
+
+LDFLAGS+=		-Wl,${RPATH_FLAG}${_SYBASE}/lib
+
+CONFIGURE_ENV+=		SYBASE="${_SYBASE}"
+CONFIGURE_ENV+=		INCDIRS="${BUILDLINK_PREFIX.readline}/include"
+CONFIGURE_ENV+=		LIBDIRS="${BUILDLINK_PREFIX.readline}/lib"
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/sqsh ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${PREFIX}/man/man1/sqsh.1
+
+.if !defined(USE_SYBASE_OPENCLIENT)
+.  include "../../databases/freetds/buildlink2.mk"
+.endif
 
+.include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"