diff options
| author | reed <reed@pkgsrc.org> | 2006-01-04 18:30:16 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2006-01-04 18:30:16 +0000 |
| commit | 83f7a0e161dd8fc7a697dbc6feda5e4bda564498 (patch) | |
| tree | 0b95dd9c7b8fd91e137ba8a1df2bc9346fee6ac3 | |
| parent | fee1be7668a10a9d59c5b3548f2845244e091398 (diff) | |
| download | pkgsrc-83f7a0e161dd8fc7a697dbc6feda5e4bda564498.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.
| -rw-r--r-- | databases/sqsh-motif/Makefile | 4 | ||||
| -rw-r--r-- | databases/sqsh-x11/Makefile | 3 | ||||
| -rw-r--r-- | databases/sqsh/Makefile | 3 | ||||
| -rw-r--r-- | databases/sqsh/Makefile.common | 8 |
4 files changed, 10 insertions, 8 deletions
diff --git a/databases/sqsh-motif/Makefile b/databases/sqsh-motif/Makefile index 7981ddfd35b..390fcdf9d8d 100644 --- a/databases/sqsh-motif/Makefile +++ b/databases/sqsh-motif/Makefile @@ -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 --git a/databases/sqsh-x11/Makefile b/databases/sqsh-x11/Makefile index f5467005c45..02d0b112eb3 100644 --- a/databases/sqsh-x11/Makefile +++ b/databases/sqsh-x11/Makefile @@ -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 --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 |