summaryrefslogtreecommitdiff
path: root/databases/sqsh
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-01-04 18:30:16 +0000
committerreed <reed@pkgsrc.org>2006-01-04 18:30:16 +0000
commitb666cf33a18279bee33a71c7c8c55a4d0dd1efc8 (patch)
tree0b95dd9c7b8fd91e137ba8a1df2bc9346fee6ac3 /databases/sqsh
parentba423668cb45b27b974f7b3e26f2791eaf9b128e (diff)
downloadpkgsrc-b666cf33a18279bee33a71c7c8c55a4d0dd1efc8.tar.gz
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 (limited to 'databases/sqsh')
-rw-r--r--databases/sqsh/Makefile3
-rw-r--r--databases/sqsh/Makefile.common8
2 files changed, 6 insertions, 5 deletions
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index e5423b21b62..bbe2dd60754 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -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 --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common
index 5ac78e8b853..44604b77508 100644
--- a/databases/sqsh/Makefile.common
+++ b/databases/sqsh/Makefile.common
@@ -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 @@ _SYBASE= ${SYBASE}
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+= SYBASE=${_SYBASE:Q}
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