Subject: please test patch for databases/freetds
To: None <tsarna@NetBSD.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 11/08/2005 22:16:25
I emailed this to some maintainers of packages that use databases/freetds.
I don't use the software myself, but I quickly built and installed it so 
it didn't install to $PREFIX/freetds.

Please test this patch for databases/freetds and maybe with a package that 
depends on it.

cvs diff: Diffing databases/freetds
Index: databases/freetds/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/freetds/Makefile,v
retrieving revision 1.26
diff -b -u -r1.26 Makefile
--- databases/freetds/Makefile	31 Oct 2005 09:55:28 -0000	1.26
+++ databases/freetds/Makefile	9 Nov 2005 06:15:12 -0000
@@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.26 2005/10/31 09:55:28 rillig 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_TOOLS+=		gmake

  GNU_CONFIGURE=		yes
-GNU_CONFIGURE_PREFIX=	${PREFIX}/freetds
-GNU_CONFIGURE_MANDIR=	${GNU_CONFIGURE_PREFIX}/${PKGMANDIR}
  CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
  CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
  CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
@@ -29,8 +27,6 @@
  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}
Index: databases/freetds/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/freetds/PLIST,v
retrieving revision 1.9
diff -b -u -r1.9 PLIST
--- databases/freetds/PLIST	31 Oct 2005 09:55:28 -0000	1.9
+++ databases/freetds/PLIST	9 Nov 2005 06:15:13 -0000
@@ -1,31 +1,31 @@
  @comment $NetBSD: PLIST,v 1.9 2005/10/31 09:55:28 rillig 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
+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/freetds-0.63/images/important.gif
  share/doc/freetds-0.63/images/note.gif
  share/doc/freetds-0.63/images/tip.gif
@@ -201,9 +201,3 @@
  @dirrm share/doc/freetds-0.63/reference
  @dirrm share/doc/freetds-0.63/images
  @dirrm share/doc/freetds-0.63
-@dirrm freetds/man/man1
-@dirrm freetds/man
-@dirrm freetds/lib
-@dirrm freetds/include
-@dirrm freetds/bin
-@dirrm freetds
Index: databases/freetds/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/freetds/buildlink3.mk,v
retrieving revision 1.4
diff -b -u -r1.4 buildlink3.mk
--- databases/freetds/buildlink3.mk	9 Oct 2005 12:58:59 -0000	1.4
+++ databases/freetds/buildlink3.mk	9 Nov 2005 06:15:13 -0000
@@ -14,8 +14,6 @@
  BUILDLINK_DEPENDS.freetds+=	freetds>=0.61.2
  BUILDLINK_RECOMMENDED.freetds+=	freetds>=0.63
  BUILDLINK_PKGSRCDIR.freetds?=	../../databases/freetds
-BUILDLINK_INCDIRS.freetds+=	freetds/include
-BUILDLINK_LIBDIRS.freetds+=	freetds/lib
  .endif	# FREETDS_BUILDLINK3_MK

  .include "../../converters/libiconv/buildlink3.mk"
cvs diff: Diffing databases/freetds/patches


One thing to note: the BUILDLINK_RECOMMENDED.freetds will probably be 
removed and the BUILDLINK_DEPENDS.freetds bumped to this new version.

Another things to change to simplify updates is to use ${PKGNAME} in PLIST 
instead of hardcoded, versioned name.

Thanks,

  Jeremy C. Reed

  	  	 	 Media Relations and Publishing Services
 	  	 	 http://www.reedmedia.net/