ports/111923: databases/unixODBC overwrites config file on package install

[Ed Maste]

Patch and new patch-Makefile.{in,am} files attached.
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/databases/unixODBC/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile	28 Nov 2006 20:01:56 -0000	1.50
+++ Makefile	19 Apr 2007 22:07:50 -0000
@@ -56,5 +56,10 @@
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .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: pkg-plist
===================================================================
RCS file: /usr/cvs/ports/databases/unixODBC/pkg-plist,v
retrieving revision 1.26
diff -u -r1.26 pkg-plist
--- pkg-plist	4 Nov 2006 23:14:18 -0000	1.26
+++ pkg-plist	19 Apr 2007 22:10:47 -0000
@@ -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/odbc.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
-------------- next part --------------
--- Makefile.am.orig	Thu Apr 19 16:36:51 2007
+++ Makefile.am	Thu Apr 19 16:37:10 2007
@@ -239,6 +239,6 @@
 	contrib/ODBCStats/appicons/info.png
 
 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
-------------- next part --------------
--- Makefile.in.orig	Thu Apr 19 17:59:50 2007
+++ Makefile.in	Thu Apr 19 18:00:08 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.