[pkgsrc/trunk]: pkgsrc/databases In the Makefile.common, remove the freetds s...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/adc2aa7e67e6
branches:  trunk
changeset: 505555:adc2aa7e67e6
user:      reed <reed%pkgsrc.org@localhost>
date:      Wed Jan 04 18:30:16 2006 +0000

description:
In the Makefile.common, remove the freetds subdirectory for the
path to the buildlink files. This is due to changes I made to the freetds
installation.

Fix "man" to PKGMANDIR while I am here.

Bump PKGREVISION for all three packages (as the location
of libct is uses is different due to the freetds change).

I didn't test sqsh-motif packaging, as I couldn't get openmotif
to build at this time.

diffstat:

 databases/sqsh-motif/Makefile  |  4 ++--
 databases/sqsh-x11/Makefile    |  3 ++-
 databases/sqsh/Makefile        |  3 ++-
 databases/sqsh/Makefile.common |  8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diffs (69 lines):

diff -r 246025647e98 -r adc2aa7e67e6 databases/sqsh-motif/Makefile
--- a/databases/sqsh-motif/Makefile     Wed Jan 04 18:08:11 2006 +0000
+++ b/databases/sqsh-motif/Makefile     Wed Jan 04 18:30:16 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/04 18:30:17 reed Exp $
 
 PKGNAME=               sqsh-motif-2.1
-PKGREVISION=           2
+PKGREVISION=           3
 
 CONFLICTS+=            sqsh-[0-9]*
 CONFLICTS+=            sqsh-x11-[0-9]*
diff -r 246025647e98 -r adc2aa7e67e6 databases/sqsh-x11/Makefile
--- a/databases/sqsh-x11/Makefile       Wed Jan 04 18:08:11 2006 +0000
+++ b/databases/sqsh-x11/Makefile       Wed Jan 04 18:30:16 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/04 18:30:17 reed Exp $
 
 PKGNAME=               sqsh-x11-2.1
+PKGREVISION=           1
 COMMENT=               SQL shell for Sybase and MS-SQL servers (X11 support)
 
 CONFLICTS+=            sqsh-[0-9]*
diff -r 246025647e98 -r adc2aa7e67e6 databases/sqsh/Makefile
--- a/databases/sqsh/Makefile   Wed Jan 04 18:08:11 2006 +0000
+++ b/databases/sqsh/Makefile   Wed Jan 04 18:30:16 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2004/03/29 12:51:54 grant Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/04 18:30:16 reed Exp $
 
 PKGNAME=       sqsh-2.1
+PKGREVISION=   1
 
 CONFLICTS+=    sqsh-motif-[0-9]*
 CONFLICTS+=    sqsh-x11-[0-9]*
diff -r 246025647e98 -r adc2aa7e67e6 databases/sqsh/Makefile.common
--- a/databases/sqsh/Makefile.common    Wed Jan 04 18:08:11 2006 +0000
+++ b/databases/sqsh/Makefile.common    Wed Jan 04 18:30:16 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2006/01/04 18:30:16 reed Exp $
 
 DISTNAME=      sqsh-2.1-src
 CATEGORIES=    databases
@@ -27,7 +27,7 @@
 PKG_FAIL_REASON+=      "You must define SYBASE to the base directory of Open Client."
 .  endif
 .else
-_SYBASE=               ${BUILDLINK_PREFIX.freetds}/freetds
+_SYBASE=               ${BUILDLINK_PREFIX.freetds}
 CONFIGURE_ENV+=                SYBASE_LIBS=-lct
 MAKE_FLAGS+=           SYBASE_LIBS=-lct
 .endif
@@ -37,11 +37,11 @@
 CONFIGURE_ENV+=                INCDIRS="${BUILDLINK_PREFIX.readline}/include"
 CONFIGURE_ENV+=                LIBDIRS="${BUILDLINK_PREFIX.readline}/lib"
 
-INSTALLATION_DIRS=     bin man/man1
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${PREFIX}/man/man1/sqsh.1
+       ${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${PREFIX}/${PKGMANDIR}/man1/sqsh.1
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sqsh
        ${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc ${PREFIX}/share/examples/sqsh