From 147ba134c7452c72e1a88b22757515f53c5eb813 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 27 Dec 2005 21:04:23 +0000 Subject: Don't install to $PREFIX/freetds anymore. Discussed with maintainer and tech-pkg in November. (I don't use this software myself, but initially looked at this to fix the manual page installation.) Get rid of BUILDLINK_PASSTHRU_DIRS as not needed now. Bump PKGREVISION. BUILDLINK_RECOMMENDED.freetds removed. And BUILDLINK_DEPENDS.freetds set to this new version. TODO: allow threadsafe on platforms that support it. --- databases/freetds/Makefile | 8 ++---- databases/freetds/PLIST | 62 +++++++++++++++++++---------------------- databases/freetds/buildlink3.mk | 7 ++--- 3 files changed, 32 insertions(+), 45 deletions(-) (limited to 'databases/freetds') diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 10e40e994b8..ee2dae259f7 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2005/12/05 23:55:04 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/27 21:04:23 reed Exp $ DISTNAME= freetds-0.63 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/ @@ -14,8 +14,6 @@ USE_PKGINSTALL= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes -GNU_CONFIGURE_PREFIX= ${PREFIX}/freetds -GNU_CONFIGURE_MANDIR= ${GNU_CONFIGURE_PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --datadir=${PREFIX}/share CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} @@ -29,8 +27,6 @@ CONF_FILES= ${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf CONF_FILES+= ${EGDIR}/locales.conf ${PKG_SYSCONFDIR}/locales.conf CONF_FILES+= ${EGDIR}/pool.conf ${PKG_SYSCONFDIR}/pool.conf -BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/freetds/lib - post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/freetds.conf ${EGDIR} diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST index 65e39a1771d..70f2323e890 100644 --- a/databases/freetds/PLIST +++ b/databases/freetds/PLIST @@ -1,31 +1,31 @@ -@comment $NetBSD: PLIST,v 1.12 2005/11/25 23:44:08 agc Exp $ -freetds/bin/bsqldb -freetds/bin/defncopy -freetds/bin/freebcp -freetds/bin/tdspool -freetds/bin/tsql -freetds/include/bkpublic.h -freetds/include/cspublic.h -freetds/include/cstypes.h -freetds/include/ctpublic.h -freetds/include/sqldb.h -freetds/include/sqlfront.h -freetds/include/sybdb.h -freetds/include/syberror.h -freetds/include/sybfront.h -freetds/include/tds.h -freetds/include/tds_sysdep_public.h -freetds/include/tdsconvert.h -freetds/include/tdssrv.h -freetds/include/tdsver.h -freetds/lib/libct.la -freetds/lib/libsybdb.la -freetds/lib/libtds.la -freetds/lib/libtdssrv.la -freetds/man/man1/bsqldb.1 -freetds/man/man1/defncopy.1 -freetds/man/man1/freebcp.1 -freetds/man/man1/tsql.1 +@comment $NetBSD: PLIST,v 1.13 2005/12/27 21:04:23 reed Exp $ +bin/bsqldb +bin/defncopy +bin/freebcp +bin/tdspool +bin/tsql +include/bkpublic.h +include/cspublic.h +include/cstypes.h +include/ctpublic.h +include/sqldb.h +include/sqlfront.h +include/sybdb.h +include/syberror.h +include/sybfront.h +include/tds.h +include/tds_sysdep_public.h +include/tdsconvert.h +include/tdssrv.h +include/tdsver.h +lib/libct.la +lib/libsybdb.la +lib/libtds.la +lib/libtdssrv.la +man/man1/bsqldb.1 +man/man1/defncopy.1 +man/man1/freebcp.1 +man/man1/tsql.1 share/doc/${PKGNAME}/images/important.gif share/doc/${PKGNAME}/images/note.gif share/doc/${PKGNAME}/images/tip.gif @@ -201,9 +201,3 @@ share/examples/freetds/pool.conf @dirrm share/doc/${PKGNAME}/reference @dirrm share/doc/${PKGNAME}/images @dirrm share/doc/${PKGNAME} -@dirrm freetds/man/man1 -@dirrm freetds/man -@dirrm freetds/lib -@dirrm freetds/include -@dirrm freetds/bin -@dirrm freetds diff --git a/databases/freetds/buildlink3.mk b/databases/freetds/buildlink3.mk index 223b94342ce..fd3ec78512d 100644 --- a/databases/freetds/buildlink3.mk +++ b/databases/freetds/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2005/10/09 12:58:59 jdolecek Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/12/27 21:04:23 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FREETDS_BUILDLINK3_MK:= ${FREETDS_BUILDLINK3_MK}+ @@ -11,11 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetds} BUILDLINK_PACKAGES+= freetds .if !empty(FREETDS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.freetds+= freetds>=0.61.2 -BUILDLINK_RECOMMENDED.freetds+= freetds>=0.63 +BUILDLINK_DEPENDS.freetds+= freetds>=0.63nb2 BUILDLINK_PKGSRCDIR.freetds?= ../../databases/freetds -BUILDLINK_INCDIRS.freetds+= freetds/include -BUILDLINK_LIBDIRS.freetds+= freetds/lib .endif # FREETDS_BUILDLINK3_MK .include "../../converters/libiconv/buildlink3.mk" -- cgit v1.2.3