* Honor PKG_SYSCONFDIR for location of freetds.conf config file.

* Use GNU_CONFIGURE_PREFIX instead of HAS_CONFIGURE workaround.

4 files changed, 35 insertions, 10 deletions

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 5498b2a58db..9e154e21ac6 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/03/14 23:57:02 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/06/23 03:38:21 jlam Exp $
 
 DISTNAME=	freetds-0.53
 CATEGORIES=	databases
@@ -12,14 +12,20 @@ COMMENT=	LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs
 USE_BUILDLINK_ONLY=	yes
 USE_GMAKE=		yes
 
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS=		--prefix=${PREFIX}/freetds
+GNU_CONFIGURE=		yes
+GNU_CONFIGURE_PREFIX=	${PREFIX}/freetds
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-tdsver=7.0
 
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-#post-install:
-#	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/db
+EGDIR=		${PREFIX}/share/examples/freetds
+CONF_FILES=	${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf
 
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/freetds.conf ${EGDIR}
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST
index 4db5600c2c2..3d9648d2de4 100644
--- a/databases/freetds/PLIST
+++ b/databases/freetds/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/14 23:57:02 wiz Exp $
-freetds/etc/freetds.conf
+@comment $NetBSD: PLIST,v 1.3 2002/06/23 03:38:21 jlam Exp $
 freetds/include/bkpublic.h
 freetds/include/common.h
 freetds/include/cspublic.h
@@ -38,7 +37,8 @@ freetds/lib/libtdssrv.la
 freetds/lib/libtdssrv.so
 freetds/lib/libtdssrv.so.0
 freetds/lib/libtdssrv.so.0.0
+share/examples/freetds/freetds.conf
+@dirrm share/examples/freetds
 @dirrm freetds/lib
 @dirrm freetds/include
-@dirrm freetds/etc
 @dirrm freetds
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index 664267f7631..fcd9409c53a 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/03/14 23:57:02 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/06/23 03:38:21 jlam Exp $
 
 SHA1 (freetds-0.53.tgz) = 7ae8e843ad91c357e9fa91e28176775737584af3
 Size (freetds-0.53.tgz) = 312692 bytes
+SHA1 (patch-aa) = 4eb859650620c4d9edadc2c684154745143ad003
diff --git a/databases/freetds/patches/patch-aa b/databases/freetds/patches/patch-aa
new file mode 100644
index 00000000000..46650fc65dd
--- /dev/null
+++ b/databases/freetds/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1 2002/06/23 03:38:21 jlam Exp $
+
+--- Makefile.in.orig	Sun Dec 16 10:40:25 2001
++++ Makefile.in
+@@ -369,12 +369,7 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(DEFDIR) $(ETC)
+-	if [ -f $(ETC)/freetds.conf ]; \
+-	then :; \
+-	else \
+-		$(INSTALL_DATA) freetds.conf $(ETC)/freetds.conf; \
+-	fi
++	$(mkinstalldirs) $(DEFDIR)
+ 
+ test:
+ 	@echo "The 'make test' option has been replaced with 'make check'";