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.18
retrieving revision 1.30
diff -u -p -r1.18 -r1.30
--- pkgsrc/databases/sqsh/Makefile	2004/01/20 12:12:49	1.18
+++ pkgsrc/databases/sqsh/Makefile	2011/04/22 14:40:41	1.30
@@ -1,34 +1,50 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:12:49 agc Exp $
+# $NetBSD: Makefile,v 1.30 2011/04/22 14:40:41 obache Exp $
 
-DISTNAME=	sqsh-1.7-src
-PKGNAME=	sqsh-1.7
-PKGREVISION=	2
+# This section contains variables that might be overridden.
+PKGNAME?=	${PKGNAME_BASE}
+COMMENT?=	SQL shell for Sybase and MS-SQL servers
+
+# Normal package Makefile contents follow.
+DISTNAME=	sqsh-2.1-src
+PKGNAME_BASE=	${DISTNAME:S/-src//}
+PKGREVISION=	8
 CATEGORIES=	databases
-MASTER_SITES=	${HOMEPAGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sqsh/}
+
+CONFLICTS+=	sqsh-[0-9]*
+CONFLICTS+=	sqsh-motif-[0-9]*
+CONFLICTS+=	sqsh-x11-[0-9]*
 
 MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.sqsh.org/
-COMMENT=	Sybase SQL shell
 
-ALL_TARGET=		sqsh
-INSTALL_TARGET=		install install.man
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include "options.mk"
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK2=		yes
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}
 GNU_CONFIGURE=		yes
+BUILD_TARGET=		build
+
 CONFIGURE_ARGS+=	--with-readline
-CONFIGURE_ENV+=		SYBASE="${BUILDLINK_PREFIX.freetds}/${SYBASE}"
+CONFIGURE_ENV+=		INCDIRS=${BUILDLINK_PREFIX.readline:Q}/include
+CONFIGURE_ENV+=		LIBDIRS=${BUILDLINK_PREFIX.readline:Q}/lib
+
+CHECK_HEADERS_SKIP=	src/sqsh_config.h
 
-SYBASE=			freetds
-LDFLAGS+=		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.freetds}/${SYBASE}/lib
+CONF_FILES+=		${PREFIX}/share/examples/sqsh/sample.sqshrc	\
+			${PKG_SYSCONFDIR}/sqshrc
 
-CONFIGURE_ENV+=		INCDIRS="${BUILDLINK_PREFIX.readline}/include"
-CONFIGURE_ENV+=		LIBDIRS="${BUILDLINK_PREFIX.readline}/lib"
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sqsh ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${PREFIX}/man/man1/sqsh.1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/sqsh.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/sqsh
+	${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc \
+		${DESTDIR}${PREFIX}/share/examples/sqsh
 
-.include "../../databases/freetds/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"