Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Dec 2013 04:28:50 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337830 - in head/editors/beav: . files
Message-ID:  <201312280428.rBS4Spst091763@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Dec 28 04:28:50 2013
New Revision: 337830
URL: http://svnweb.freebsd.org/changeset/ports/337830

Log:
  editors/beav: Unbreak after staging support attempt
  
  After recent commits, beav was broken on every platform for a couple
  of reasons.  Primarily the Makefile had a bug in it, so it was
  unexecutable.  Secondly, the "man page fix" was done in ${STAGEDIR}
  using sed -i, causing the resultant .bak file to also be installed, or
  at least orphaned.  Poudriere caught that issue.
  
  While here, add DragonFly support.

Modified:
  head/editors/beav/Makefile
  head/editors/beav/files/patch-termio.c

Modified: head/editors/beav/Makefile
==============================================================================
--- head/editors/beav/Makefile	Sat Dec 28 04:28:43 2013	(r337829)
+++ head/editors/beav/Makefile	Sat Dec 28 04:28:50 2013	(r337830)
@@ -20,12 +20,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 ALL_TARGET=	beav
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DUNIX -DBSD -DNOPROTO"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|(OFILES):|$$(OFILES):|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/beav.1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/beav ${STAGEDIR}${PREFIX}/bin/beav
 	${INSTALL_MAN} ${WRKSRC}/beav.1 ${STAGEDIR}${PREFIX}/man/man1/beav.1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/beav140.txt ${STAGEDIR}${DOCSDIR}/beav.txt
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-	    ${STAGEDIR}${PREFIX}/man/man1/beav.1
 
 .include <bsd.port.mk>

Modified: head/editors/beav/files/patch-termio.c
==============================================================================
--- head/editors/beav/files/patch-termio.c	Sat Dec 28 04:28:43 2013	(r337829)
+++ head/editors/beav/files/patch-termio.c	Sat Dec 28 04:28:50 2013	(r337830)
@@ -5,7 +5,7 @@
  #ifdef UNIX			/* System V */
  
 +#if defined(__GLIBC__) || \
-+    defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++    defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 +#define TERMIOS 1
 +#endif
 +



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312280428.rBS4Spst091763>