summaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authornork <nork@FreeBSD.org>2003-04-21 16:07:04 +0000
committernork <nork@FreeBSD.org>2003-04-21 16:07:04 +0000
commit23a57a39e1acb6f87227fdb5db49086f2afc44c9 (patch)
tree7342ddc58d1bae7abe9948a3b1804ce77bc6a03f /databases
parent2d4d3b7c103987b0324c7939170cc8fef94b488d (diff)
downloadFreeBSD-ports-23a57a39e1acb6f87227fdb5db49086f2afc44c9.zip
FreeBSD-ports-23a57a39e1acb6f87227fdb5db49086f2afc44c9.tar.gz
Correct the overwrite of configuration files.
Submitted by: Alex Kiesel <kiesel@schlund.de> (maintainer)
Diffstat (limited to 'databases')
-rw-r--r--databases/freetds-devel/Makefile12
-rw-r--r--databases/freetds-devel/pkg-plist7
-rw-r--r--databases/freetds/Makefile12
-rw-r--r--databases/freetds/pkg-plist7
4 files changed, 22 insertions, 16 deletions
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 030f788..9f1bbbc 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -6,6 +6,7 @@
PORTNAME= freetds
PORTVERSION= 0.61
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/freetds/stable
@@ -44,18 +45,21 @@ PLIST_SUB+= ODBC="@comment "
post-extract:
@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
+ @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist
+ @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.dist
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|<malloc.h>|<stdlib.h>| ; \
s|/freetds.conf|/freetds.conf.dist|g ; \
+ s|/locales.conf|/locales.conf.dist|g ; \
+ s|/pool.conf|/pool.conf.dist|g ; \
s| common.h||g'
post-install:
-.if !exists(${PREFIX}/etc/freetds.conf)
- @${CP} ${PREFIX}/etc/freetds.conf.dist ${PREFIX}/etc/freetds.conf
-.endif
@${MKDIR} ${PREFIX}/etc/freetds
- ${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds
+ @${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds/interfaces.dist
+ @${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc"
+ @${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names"
.include <bsd.port.mk>
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index 43270b6..8216ee2 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -1,11 +1,10 @@
bin/freebcp
bin/tdspool
bin/tsql
-@unexec if cmp -s %D/etc/freetds.conf.dist %D/etc/freetds.conf; then rm -f %D/etc/freetds.conf; fi
etc/freetds.conf.dist
-etc/freetds/interfaces
-etc/locales.conf
-etc/pool.conf
+etc/freetds/interfaces.dist
+etc/locales.conf.dist
+etc/pool.conf.dist
include/bkpublic.h
include/cspublic.h
include/cstypes.h
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 030f788..9f1bbbc 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -6,6 +6,7 @@
PORTNAME= freetds
PORTVERSION= 0.61
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/freetds/stable
@@ -44,18 +45,21 @@ PLIST_SUB+= ODBC="@comment "
post-extract:
@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
+ @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist
+ @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.dist
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|<malloc.h>|<stdlib.h>| ; \
s|/freetds.conf|/freetds.conf.dist|g ; \
+ s|/locales.conf|/locales.conf.dist|g ; \
+ s|/pool.conf|/pool.conf.dist|g ; \
s| common.h||g'
post-install:
-.if !exists(${PREFIX}/etc/freetds.conf)
- @${CP} ${PREFIX}/etc/freetds.conf.dist ${PREFIX}/etc/freetds.conf
-.endif
@${MKDIR} ${PREFIX}/etc/freetds
- ${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds
+ @${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds/interfaces.dist
+ @${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc"
+ @${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names"
.include <bsd.port.mk>
diff --git a/databases/freetds/pkg-plist b/databases/freetds/pkg-plist
index 43270b6..8216ee2 100644
--- a/databases/freetds/pkg-plist
+++ b/databases/freetds/pkg-plist
@@ -1,11 +1,10 @@
bin/freebcp
bin/tdspool
bin/tsql
-@unexec if cmp -s %D/etc/freetds.conf.dist %D/etc/freetds.conf; then rm -f %D/etc/freetds.conf; fi
etc/freetds.conf.dist
-etc/freetds/interfaces
-etc/locales.conf
-etc/pool.conf
+etc/freetds/interfaces.dist
+etc/locales.conf.dist
+etc/pool.conf.dist
include/bkpublic.h
include/cspublic.h
include/cstypes.h
OpenPOWER on IntegriCloud