From 30ad956649925475bc50fa2c57d145504c765d6f Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 23 Dec 2014 13:58:19 +0000
Subject: [PATCH] Samples should be named .sample

---
 databases/py-swift/Makefile  | 26 +++++++++++++++++++-------
 databases/py-swift/pkg-plist | 28 ++++++++++++++--------------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/databases/py-swift/Makefile b/databases/py-swift/Makefile
index 704a3d3e2137..943b1ea5f159 100644
--- a/databases/py-swift/Makefile
+++ b/databases/py-swift/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	swift
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	http://launchpadlibrarian.net/187486124/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -33,8 +34,16 @@ USE_RC_SUBR=	swift
 USERS=		swift
 GROUPS=		swift
 
+post-extract:
+	@(cd ${WRKSRC}/etc; \
+	for f in *-sample; do\
+	${MV} $${f} $${f%%-sample}.sample;\
+	done)
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/swift|${PREFIX}/etc/${PORTNAME}|" \
+		-e "s|conf-sample|conf.sample|" \
+		-e "s|types-sample|types.sample|" \
 		${WRKSRC}/bin/swift-account-audit \
 		${WRKSRC}/bin/swift-account-info \
 		${WRKSRC}/bin/swift-container-info \
@@ -55,13 +64,15 @@ post-patch:
 		${WRKSRC}/doc/manpages/swift-dispersion-report.1 \
 		${WRKSRC}/doc/manpages/swift-get-nodes.1 \
 		${WRKSRC}/doc/manpages/swift-recon.1 \
-		${WRKSRC}/etc/account-server.conf-sample \
-		${WRKSRC}/etc/container-reconciler.conf-sample \
-		${WRKSRC}/etc/container-server.conf-sample \
-		${WRKSRC}/etc/dispersion.conf-sample \
-		${WRKSRC}/etc/object-expirer.conf-sample \
-		${WRKSRC}/etc/object-server.conf-sample \
-		${WRKSRC}/etc/proxy-server.conf-sample \
+		${WRKSRC}/etc/account-server.conf.sample \
+		${WRKSRC}/etc/container-reconciler.conf.sample \
+		${WRKSRC}/etc/container-server.conf.sample \
+		${WRKSRC}/etc/dispersion.conf.sample \
+		${WRKSRC}/etc/object-expirer.conf.sample \
+		${WRKSRC}/etc/object-server.conf.sample \
+		${WRKSRC}/etc/proxy-server.conf.sample \
+		${WRKSRC}/etc/swift.conf.sample \
+		${WRKSRC}/swift.egg-info/SOURCES.txt \
 		${WRKSRC}/swift/account/reaper.py \
 		${WRKSRC}/swift/cli/info.py \
 		${WRKSRC}/swift/cli/recon.py \
@@ -75,6 +86,7 @@ post-patch:
 		${WRKSRC}/swift/common/middleware/memcache.py \
 		${WRKSRC}/swift/common/middleware/recon.py \
 		${WRKSRC}/swift/common/middleware/staticweb.py \
+		${WRKSRC}/swift/common/middleware/tempauth.py \
 		${WRKSRC}/swift/common/utils.py \
 		${WRKSRC}/swift/container/reconciler.py \
 		${WRKSRC}/swift/container/server.py \
diff --git a/databases/py-swift/pkg-plist b/databases/py-swift/pkg-plist
index f9b600daec65..24f066cc42f8 100644
--- a/databases/py-swift/pkg-plist
+++ b/databases/py-swift/pkg-plist
@@ -1,17 +1,17 @@
-@sample %%ETCDIR%%/account-server.conf-sample
-@sample %%ETCDIR%%/container-reconciler.conf-sample
-@sample %%ETCDIR%%/container-server.conf-sample
-@sample %%ETCDIR%%/container-sync-realms.conf-sample
-@sample %%ETCDIR%%/dispersion.conf-sample
-@sample %%ETCDIR%%/drive-audit.conf-sample
-@sample %%ETCDIR%%/memcache.conf-sample
-@sample %%ETCDIR%%/mime.types-sample
-@sample %%ETCDIR%%/object-expirer.conf-sample
-@sample %%ETCDIR%%/object-server.conf-sample
-@sample %%ETCDIR%%/proxy-server.conf-sample
-@sample %%ETCDIR%%/rsyncd.conf-sample
-@sample %%ETCDIR%%/swift-rsyslog.conf-sample
-@sample %%ETCDIR%%/swift.conf-sample
+@sample %%ETCDIR%%/account-server.conf.sample
+@sample %%ETCDIR%%/container-reconciler.conf.sample
+@sample %%ETCDIR%%/container-server.conf.sample
+@sample %%ETCDIR%%/container-sync-realms.conf.sample
+@sample %%ETCDIR%%/dispersion.conf.sample
+@sample %%ETCDIR%%/drive-audit.conf.sample
+@sample %%ETCDIR%%/memcache.conf.sample
+@sample %%ETCDIR%%/mime.types.sample
+@sample %%ETCDIR%%/object-expirer.conf.sample
+@sample %%ETCDIR%%/object-server.conf.sample
+@sample %%ETCDIR%%/proxy-server.conf.sample
+@sample %%ETCDIR%%/rsyncd.conf.sample
+@sample %%ETCDIR%%/swift-rsyslog.conf.sample
+@sample %%ETCDIR%%/swift.conf.sample
 man/man1/swift-account-auditor.1.gz
 man/man1/swift-account-info.1.gz
 man/man1/swift-account-reaper.1.gz