From ceaef15613b0d24913011536219d021350cfcbfb Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 4 Mar 2015 23:46:44 +0000
Subject: MFH: r380201

- Simplify MASTER_SITES
- Fix installation from non-root
- Fix binary permissions

Approved by:	ports-secteam (delphij)
---
 comms/yaps/Makefile             | 11 ++++++-----
 comms/yaps/files/patch-Makefile |  8 ++++----
 comms/yaps/pkg-plist            |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/comms/yaps/Makefile b/comms/yaps/Makefile
index 7944c8e07dfc..63a4f2790939 100644
--- a/comms/yaps/Makefile
+++ b/comms/yaps/Makefile
@@ -3,23 +3,24 @@
 
 PORTNAME=	yaps
 PORTVERSION=	0.96
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/serialcomm/machines
+MASTER_SITES=	SUNSITE/apps/serialcomm/machines
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet Another Pager Software: send messages to pager (SMS, TAP, ...)
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
 USES=		gmake
 
 OPTIONS_DEFINE=	DOCS
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/yaps ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/yaps.rc ${STAGEDIR}${PREFIX}/etc/yaps.rc.sample
-	${INSTALL_MAN} ${WRKSRC}/yaps.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/yaps.1 ${STAGEDIR}${PREFIX}/man/man1/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/yaps.doc ${WRKSRC}/yaps.html ${STAGEDIR}${DOCSDIR}
 
diff --git a/comms/yaps/files/patch-Makefile b/comms/yaps/files/patch-Makefile
index 58eb808e59ec..4f48e55ef38c 100644
--- a/comms/yaps/files/patch-Makefile
+++ b/comms/yaps/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2013-11-17 23:01:50.000000000 +0800
-+++ Makefile	2013-11-17 23:04:00.000000000 +0800
-@@ -33,15 +33,15 @@ yaps.doc:	yaps.html
+--- Makefile.orig	1997-06-06 15:45:35.000000000 +0400
++++ Makefile	2015-02-26 00:28:11.000000000 +0300
+@@ -33,15 +33,15 @@
  	lynx -cfg=/dev/null -nolist -dump $< > $@
  
  install:	$(DSTFLE) $(CFGFILE)
@@ -15,7 +15,7 @@
  
  $(DSTFLE):	yaps
 -	install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $@
-+	install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $(DESTDIR)$@
++	install -m 711 -s yaps $(DESTDIR)$@
  
  $(CFGFILE):	yaps.rc
  	@if [ ! -f $@ ]; then \
diff --git a/comms/yaps/pkg-plist b/comms/yaps/pkg-plist
index d352b9701161..e7a4ea76fecf 100644
--- a/comms/yaps/pkg-plist
+++ b/comms/yaps/pkg-plist
@@ -1,5 +1,5 @@
-bin/yaps
-etc/yaps.rc.sample
+@(root,dialer,2711) bin/yaps
+@sample etc/yaps.rc.sample
 man/man1/yaps.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/yaps.doc
 %%PORTDOCS%%%%DOCSDIR%%/yaps.html
-- 
cgit v1.2.3