From 8ea9e7a7065e597699409e9d377b2d2d2f9fb91b Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 4 Apr 2014 11:00:35 +0000
Subject: [PATCH] Do not leak stagedir in the generated binary Remove now
 useless pre-su target

MFH:	2014Q2
---
 news/sn/Makefile             |  8 ++++----
 news/sn/files/patch-Makefile | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 news/sn/files/patch-Makefile

diff --git a/news/sn/Makefile b/news/sn/Makefile
index 030f8e8a9a62..ab43637b2010 100644
--- a/news/sn/Makefile
+++ b/news/sn/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sn
 PORTVERSION=	0.3.8
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	http://www.infa.abo.fi/~patrik/sn/files/ \
 		http://home.arcor.de/teambushido/fbsd_ports/ \
@@ -13,9 +14,8 @@ COMMENT=	Small news system for small sites serving
 
 LICENSE=	GPLv2
 
-USES=		gmake
-USE_BZIP2=	yes
-MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" LD="${CC}" CC="${CC}"
+USES=		gmake tar:bzip2
+MAKE_ARGS+=	PREFIX="${PREFIX}" LD="${CC}" CC="${CC}"
 
 PORTDOCS=	README CHANGES FAQ INSTALL INTERNALS \
 		THANKS TODO INSTALL.notes INSTALL.notes2 \
@@ -30,7 +30,7 @@ post-patch:
 		s|-g -Wall -pedantic -O|${CFLAGS} -Wall -pedantic|' \
 			${WRKSRC}/Makefile
 
-pre-su-install:
+pre-install:
 	@${MKDIR} ${STAGEDIR}/var/spool/news
 
 post-install:
diff --git a/news/sn/files/patch-Makefile b/news/sn/files/patch-Makefile
new file mode 100644
index 000000000000..17a8eea6af9b
--- /dev/null
+++ b/news/sn/files/patch-Makefile
@@ -0,0 +1,21 @@
+--- ./Makefile.orig	2014-04-04 12:17:36.551829000 +0200
++++ ./Makefile	2014-04-04 12:20:01.852681999 +0200
+@@ -144,12 +144,12 @@
+ strip: $(BINS)
+ 	strip $^
+ 
+-install: all #$(SNROOT) $(BINDIR) $(MANDIR)/man8 # commented out so make -n install works without the dirs
+-	$(INSTALL) $(PROGS) $(BINDIR)
+-	$(INSTALL) *.8 $(MANDIR)/man8
+-	-cd $(BINDIR); rm -f sncat; ln -s snscan sncat
+-	-cd $(BINDIR); rm -f sncancel; ln -s snscan sncancel
+-	-cd $(BINDIR); rm -f snstore; ln -s snsend snstore
++install: all #$(SNROOT) $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8 # commented out so make -n install works without the dirs
++	$(INSTALL) $(PROGS) $(DESTDIR)$(BINDIR)
++	$(INSTALL) *.8 $(DESTDIR)$(MANDIR)/man8
++	-cd $(DESTDIR)$(BINDIR); rm -f sncat; ln -s snscan sncat
++	-cd $(DESTDIR)$(BINDIR); rm -f sncancel; ln -s snscan sncancel
++	-cd $(DESTDIR)$(BINDIR); rm -f snstore; ln -s snsend snstore
+ 
+ spoolclean:
+ 	@echo -n "make $@ will wipe out your news spool!  Sure? [y/n] "