svn commit: r380463 - in branches/2015Q1/comms/yaps: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Mar  4 23:46:44 2015
New Revision: 380463
URL: https://svnweb.freebsd.org/changeset/ports/380463
QAT: https://qat.redports.org/buildarchive/r380463/

Log:
  MFH: r380201
  
  - Simplify MASTER_SITES
  - Fix installation from non-root
  - Fix binary permissions
  
  Approved by:	ports-secteam (delphij)

Modified:
  branches/2015Q1/comms/yaps/Makefile
  branches/2015Q1/comms/yaps/files/patch-Makefile
  branches/2015Q1/comms/yaps/pkg-plist
Directory Properties:
  branches/2015Q1/   (props changed)

Modified: branches/2015Q1/comms/yaps/Makefile
==============================================================================
--- branches/2015Q1/comms/yaps/Makefile	Wed Mar  4 23:45:04 2015	(r380462)
+++ branches/2015Q1/comms/yaps/Makefile	Wed Mar  4 23:46:44 2015	(r380463)
@@ -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 at 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}
 

Modified: branches/2015Q1/comms/yaps/files/patch-Makefile
==============================================================================
--- branches/2015Q1/comms/yaps/files/patch-Makefile	Wed Mar  4 23:45:04 2015	(r380462)
+++ branches/2015Q1/comms/yaps/files/patch-Makefile	Wed Mar  4 23:46:44 2015	(r380463)
@@ -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 \

Modified: branches/2015Q1/comms/yaps/pkg-plist
==============================================================================
--- branches/2015Q1/comms/yaps/pkg-plist	Wed Mar  4 23:45:04 2015	(r380462)
+++ branches/2015Q1/comms/yaps/pkg-plist	Wed Mar  4 23:46:44 2015	(r380463)
@@ -1,5 +1,5 @@
-bin/yaps
-etc/yaps.rc.sample
+@(root,dialer,2711) bin/yaps
+ at sample etc/yaps.rc.sample
 man/man1/yaps.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/yaps.doc
 %%PORTDOCS%%%%DOCSDIR%%/yaps.html