- Please poudriere build by using @sample (better and simpler)

- Bump PORTREVISION

2 files changed, 5 insertions, 7 deletions

diff --git a/news/tin/Makefile b/news/tin/Makefile
index 64b1263e12f7..146a7797f3c8 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tin
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES+=	news ipv6
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
 		ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \
@@ -87,12 +88,11 @@ post-patch:
 		${WRKSRC}/tools/tinurl_handler.pl
 
 post-build:
-	cd ${WRKSRC}/po; ${GMAKE}
+	${GMAKE} -C ${WRKSRC}/po
 
 post-install:
-	cd ${STAGEDIR}${PREFIX}/etc;\
-		${INSTALL_DATA} ${WRKSRC}/doc/tin.defaults tin.defaults.dist;\
-		${CP} -pn tin.defaults.dist tin.defaults;
+	${INSTALL_DATA} ${WRKSRC}/doc/tin.defaults \
+		${STAGEDIR}${PREFIX}/etc/tin.defaults.sample
 	ln -sf tin ${STAGEDIR}${PREFIX}/bin/rtin
 
 .include <bsd.port.mk>
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 55894e9b5880..26db44c477f2 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -5,9 +5,7 @@ bin/tin
 bin/tinews.pl
 bin/tinurl_handler.pl
 bin/w2r.pl
-@unexec if cmp -s %D/etc/tin.defaults %D/etc/tin.defaults.dist; then rm -f %D/etc/tin.defaults; fi
-etc/tin.defaults.dist
-@exec [ -f %B/tin.defaults ] || cp %B/%f %B/tin.defaults
+@sample etc/tin.defaults.sample
 man/man1/opt-case.pl.1.gz
 man/man1/rtin.1.gz
 man/man1/tin.1.gz