[Midnightbsd-cvs] mports: databases/unixODBC: This port was broken.

[laffer1 at midnightbsd.org]

Log Message:
-----------
This port was broken.  Didn't fake properly.

Update it to a newer version which does fake properly.

Modified Files:
--------------
    mports/databases/unixODBC:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

Added Files:
-----------
    mports/databases/unixODBC/files:
        patch-Makefile.in (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/databases/unixODBC/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/unixODBC/pkg-plist -Ldatabases/unixODBC/pkg-plist -u -r1.1 -r1.2
--- databases/unixODBC/pkg-plist
+++ databases/unixODBC/pkg-plist
@@ -7,8 +7,12 @@
 bin/odbc_config
 bin/odbcinst
 %%GUI:%%bin/odbctest
-etc/odbc.ini
-etc/odbcinst.ini
+ at unexec if cmp -s %D/etc/odbc.ini %D/etc/odbc.ini.sample; then  rm -f %D/etc/odbc.ini; fi
+etc/odbc.ini.sample
+ at exec [ -f %D/etc/odbc.ini ] || cp %D/etc/odbc.ini.sample %D/etc/odbc.ini
+ at unexec if cmp -s %D/etc/odbcinst.ini %D/etc/odbcinst.ini.sample; then rm -f %D/etc/odbcinst.ini; fi
+etc/odbcinst.ini.sample
+ at exec [ -f %D/etc/odbcinst.ini ] || cp %D/etc/odbcinst.ini.sample %D/etc/odbcinst.ini
 include/autotest.h
 include/odbcinst.h
 include/odbcinstext.h
@@ -16,6 +20,7 @@
 include/sqlext.h
 include/sqltypes.h
 include/sqlucode.h
+include/uodbc_extras.h
 include/uodbc_stats.h
 lib/libboundparam.a
 lib/libboundparam.la
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/unixODBC/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/unixODBC/Makefile -Ldatabases/unixODBC/Makefile -u -r1.1 -r1.2
--- databases/unixODBC/Makefile
+++ databases/unixODBC/Makefile
@@ -2,24 +2,24 @@
 # Date created:         May 11, 2000
 # Whom:                 Nick Sayer <nsayer at FreeBSD.org>
 #
-# $FreeBSD: ports/databases/unixODBC/Makefile,v 1.47 2006/08/14 22:55:04 clsung Exp $
 # $MidnightBSD$
+# $FreeBSD: ports/databases/unixODBC/Makefile,v 1.52 2007/07/30 15:30:55 arved Exp $
 #
 
 PORTNAME=	unixODBC
-PORTVERSION=	2.2.11
-PORTREVISION=	1
+PORTVERSION=	2.2.12
 CATEGORIES=	databases
 MASTER_SITES=	http://www.unixodbc.org/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	ODBC library suite for Unix
+LICENSE=	lgpl
 
 CONFLICTS=	libiodbc-*
 
 USE_GNOME=	gnomehack gnometarget
 USE_ICONV=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-static --enable-shared \
 		--with-libiconv-prefix=${LOCALBASE}
 USE_LDCONFIG=	yes
@@ -45,12 +45,24 @@
 CONFIGURE_ARGS+=	--enable-threads=no
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's, at MSQL_TRUE@lib_LTLIBRARIES,#@MSQL_TRUE at lib_LTLIBRARIES,' ${WRKSRC}/Drivers/MiniSQL/Makefile.in
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . \
 		| ${TAR} -C ${DOCSDIR} --unlink -xf -
+.if !defined(INSTALL_AS_USER)
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	${FIND} ${DOCSDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+.endif
 .endif
+.for conffile in odbc.ini odbcinst.ini
+	@if [ ! -f ${PREFIX}/etc/${conffile} ]; then \
+		${CP} -p ${PREFIX}/etc/${conffile}.sample ${PREFIX}/etc/${conffile} ; \
+	fi
+.endfor
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/unixODBC/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldatabases/unixODBC/distinfo -Ldatabases/unixODBC/distinfo -u -r1.1 -r1.2
--- databases/unixODBC/distinfo
+++ databases/unixODBC/distinfo
@@ -1,3 +1,3 @@
-MD5 (unixODBC-2.2.11.tar.gz) = 9ae806396844e38244cf65ad26ba0f23
-SHA256 (unixODBC-2.2.11.tar.gz) = 7990bc1652c083ccd2b7915a14e4a3bb1901c5bf988be20001dfcb3dfb58ed88
-SIZE (unixODBC-2.2.11.tar.gz) = 2406740
+MD5 (unixODBC-2.2.12.tar.gz) = 9a116aad4059c31d231b626ffdf1869a
+SHA256 (unixODBC-2.2.12.tar.gz) = d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40
+SIZE (unixODBC-2.2.12.tar.gz) = 2798077
--- /dev/null
+++ databases/unixODBC/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Sun Jun 24 15:44:33 2007
++++ Makefile.in	Sun Jun 24 15:45:04 2007
+@@ -876,8 +876,8 @@
+ 
+ 
+ install-data-am:
+-	-touch $(DESTDIR)${sysconfdir}/odbcinst.ini
+-	-touch $(DESTDIR)${sysconfdir}/odbc.ini
++	-touch $(DESTDIR)${sysconfdir}/odbcinst.ini.sample
++	-touch $(DESTDIR)${sysconfdir}/odbc.ini.sample
+ 	-mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.