summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/tcl-postgresql/Makefile40
-rw-r--r--databases/tcl-postgresql/files/man.tcl3
-rw-r--r--databases/tcl-postgresql/pkg/DESCR5
-rw-r--r--databases/tcl-postgresql/pkg/PLIST3
4 files changed, 24 insertions, 27 deletions
diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile
index 7d55c29956e..c955db06c8c 100644
--- a/databases/tcl-postgresql/Makefile
+++ b/databases/tcl-postgresql/Makefile
@@ -1,46 +1,42 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:17:42 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/14 14:53:52 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.ssl"
-PKGNAME= tcl-${DISTNAME}
-
+PKGNAME= tcl-postgresql-${PG_VERS}
+PG_PKG_VERS= # empty
COMMENT= Tcl interface to PostgreSQL
-DEPENDS+= postgresql-${PG_VERS}:../../databases/postgresql
+DEPENDS+= postgresql-lib>=${PG_BASE_VERS}:../../databases/postgresql-lib
DEPENDS+= tcl>=8.3.2:../../lang/tcl
-EVAL_PREFIX+= TCLDIR=tcl
-TCLSH= ${TCLDIR}/bin/tclsh
-TCL_INCDIR= ${TCLDIR}/include
-TCL_CONFIGDIR= ${TCLDIR}/lib
+TCLSH= ${LOCALBASE}/bin/tclsh
+TCL_CONFIGDIR= ${LOCALBASE}/lib
MAKE_ENV+= INSTALLED_LIBPQ=1
-CONFIGURE_ARGS+= --without-perl --without-odbc
-CONFIGURE_ARGS+= --with-tcl \
- --with-tclconfig="${TCL_CONFIGDIR}" \
- --with-includes="${TCL_INCDIR}" \
- --with-libraries="${LOCALBASE}/lib ${TCLDIR}/lib"
+CONFIGURE_ARGS+= --with-tcl
+CONFIGURE_ARGS+= --with-tclconfig="${TCL_CONFIGDIR}"
+CONFIGURE_ARGS+= --with-includes="${LOCALBASE}/include"
+CONFIGURE_ARGS+= --with-libraries="${LOCALBASE}/lib"
CONFIGURE_ENV+= TCLSH="${TCLSH}"
-DIRS_TO_BUILD= interfaces/libpgtcl \
- bin/pgtclsh \
- pl/tcl
+DIRS_TO_BUILD= src/interfaces/libpgtcl src/bin/pgtclsh
do-build:
.for DIR in ${DIRS_TO_BUILD}
- cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
+ cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
.endfor
do-install:
.for DIR in ${DIRS_TO_BUILD}
- cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
+ cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
.endfor
- strip ${PREFIX}/bin/pgtclsh
- ${GTAR} zxCf ${PREFIX}/man \
- ${WRKDIR}/${DISTNAME}/doc/man.tar.gz \
- `${SED} -e "s/#.*//" ${FILESDIR}/man.tcl`
+
+post-install:
+ ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \
+ `${SED} -e "s|#.*||" ${FILESDIR}/man.tcl`
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/tcl-postgresql/files/man.tcl b/databases/tcl-postgresql/files/man.tcl
new file mode 100644
index 00000000000..2fe4f39bbb1
--- /dev/null
+++ b/databases/tcl-postgresql/files/man.tcl
@@ -0,0 +1,3 @@
+# $NetBSD: man.tcl,v 1.1 2001/05/14 14:53:53 jlam Exp $
+#
+man1/pgtclsh.1
diff --git a/databases/tcl-postgresql/pkg/DESCR b/databases/tcl-postgresql/pkg/DESCR
index 04877175907..a6d6ddcf608 100644
--- a/databases/tcl-postgresql/pkg/DESCR
+++ b/databases/tcl-postgresql/pkg/DESCR
@@ -1,3 +1,2 @@
-Tcl interface to PostgreSQL, including front-end clients, a loadable
-shared object for Tcl clients, and the PL/Tcl procedural language for
-the PostgreSQL backend.
+Tcl interface to PostgreSQL, including front-end clients and a loadable
+shared object for Tcl clients.
diff --git a/databases/tcl-postgresql/pkg/PLIST b/databases/tcl-postgresql/pkg/PLIST
index 9a26ea86d64..5ebf73a74f7 100644
--- a/databases/tcl-postgresql/pkg/PLIST
+++ b/databases/tcl-postgresql/pkg/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2001/01/04 15:10:25 agc Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/05/14 14:53:53 jlam Exp $
bin/pgtclsh
include/pgsql/libpgtcl.h
lib/libpgtcl.a
lib/libpgtcl.so
lib/libpgtcl.so.2
lib/libpgtcl.so.2.1
-lib/pltcl.so
man/man1/pgtclsh.1