svn commit: r367683 - in head/textproc/cwtext: . files

[Antoine Brodin]

Author: antoine
Date: Mon Sep  8 19:26:54 2014
New Revision: 367683
URL: http://svnweb.freebsd.org/changeset/ports/367683
QAT: https://qat.redports.org/buildarchive/r367683/

Log:
  - Allow staging as a regular user
  - USES=python

Modified:
  head/textproc/cwtext/Makefile
  head/textproc/cwtext/files/patch-makefile

Modified: head/textproc/cwtext/Makefile
==============================================================================
--- head/textproc/cwtext/Makefile	Mon Sep  8 19:24:50 2014	(r367682)
+++ head/textproc/cwtext/Makefile	Mon Sep  8 19:26:54 2014	(r367683)
@@ -9,8 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	db at FreeBSD.org
 COMMENT=	Morse Code Generator
 
-USE_PYTHON=	yes
-USES=		gmake
+USES=		gmake python
 MAKEFILE=	makefile
 ALL_TARGET=	ALL
 
@@ -18,12 +17,8 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%STAGEDIR%%,${STAGEDIR},g" \
-		${WRKSRC}/makefile
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/textproc/cwtext/files/patch-makefile
==============================================================================
--- head/textproc/cwtext/files/patch-makefile	Mon Sep  8 19:24:50 2014	(r367682)
+++ head/textproc/cwtext/files/patch-makefile	Mon Sep  8 19:26:54 2014	(r367683)
@@ -1,18 +1,17 @@
---- makefile.orig	2004-12-16 07:15:22.000000000 -0500
-+++ makefile	2013-12-30 18:06:28.000000000 -0500
-@@ -1,11 +1,10 @@
+--- makefile.orig	2004-12-16 12:15:22 UTC
++++ makefile
+@@ -1,11 +1,9 @@
 -PREFIX=/usr/local
 -
  ALL: cwtext cwpcm cwmm
-+STAGEDIR=%%STAGEDIR%%
  
  install: ALL
 -	install -sc cwtext ${PREFIX}/bin
 -	install -sc cwpcm ${PREFIX}/bin
 -	install -sc cwmm ${PREFIX}/bin
-+	install  -s -o root -g wheel -m 555 cwtext ${STAGEDIR}${PREFIX}/bin
-+	install  -s -o root -g wheel -m 555 cwpcm ${STAGEDIR}${PREFIX}/bin
-+	install  -s -o root -g wheel -m 555 cwmm ${STAGEDIR}${PREFIX}/bin
++	$(BSD_INSTALL_PROGRAM) cwtext ${DESTDIR}${PREFIX}/bin
++	$(BSD_INSTALL_PROGRAM) cwpcm ${DESTDIR}${PREFIX}/bin
++	$(BSD_INSTALL_PROGRAM) cwmm ${DESTDIR}${PREFIX}/bin
  
  cwmm: cwmm.o morse.o
  	${CC} ${CFLAGS} -o cwmm $^