From owner-svn-ports-head@FreeBSD.ORG Sat Dec 28 04:28:51 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8487CF38; Sat, 28 Dec 2013 04:28:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 58DCF1F35; Sat, 28 Dec 2013 04:28:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBS4SpXm091765; Sat, 28 Dec 2013 04:28:51 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBS4Spst091763; Sat, 28 Dec 2013 04:28:51 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201312280428.rBS4Spst091763@svn.freebsd.org> From: John Marino Date: Sat, 28 Dec 2013 04:28:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337830 - in head/editors/beav: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 04:28:51 -0000 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 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 +