From owner-svn-ports-all@freebsd.org Sun Aug 7 17:08:20 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9EC72BB10A3; Sun, 7 Aug 2016 17:08:20 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 58F251A1D; Sun, 7 Aug 2016 17:08:20 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u77H8JxP026529; Sun, 7 Aug 2016 17:08:19 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u77H8Jeb026527; Sun, 7 Aug 2016 17:08:19 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201608071708.u77H8Jeb026527@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 7 Aug 2016 17:08:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419782 - in head/devel/funnelweb: . 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-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Aug 2016 17:08:20 -0000 Author: marino Date: Sun Aug 7 17:08:19 2016 New Revision: 419782 URL: https://svnweb.freebsd.org/changeset/ports/419782 Log: devel/funnelweb: Rework to fix patching Required to add DragonFly support patch. Added: head/devel/funnelweb/files/ head/devel/funnelweb/files/patch-environ.h (contents, props changed) Modified: head/devel/funnelweb/Makefile Modified: head/devel/funnelweb/Makefile ============================================================================== --- head/devel/funnelweb/Makefile Sun Aug 7 16:50:01 2016 (r419781) +++ head/devel/funnelweb/Makefile Sun Aug 7 17:08:19 2016 (r419782) @@ -11,15 +11,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Powerful literate-programming macro pre-processor PLIST_FILES= bin/fw -WRKSRC= fw_src/source +WRKSRC= ${WRKDIR}/fw_src/source do-build: - cd ${WRKDIR}/${WRKSRC} && { \ - ${CC} ${CFLAGS} -c *.c && \ - ${CC} ${CFLAGS} -o fw *.o; \ - } + (cd ${WRKSRC} && ${CC} ${CFLAGS} -c *.c && ${CC} ${CFLAGS} -o fw *.o) do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${WRKSRC}/fw ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/fw ${STAGEDIR}${PREFIX}/bin .include Added: head/devel/funnelweb/files/patch-environ.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/funnelweb/files/patch-environ.h Sun Aug 7 17:08:19 2016 (r419782) @@ -0,0 +1,33 @@ +--- environ.h.orig 1999-05-16 01:09:55.000000000 +0200 ++++ environ.h +@@ -84,6 +84,7 @@ Changes: + #define OS_L86 0 /* Linux */ + #define OS_AIX 0 /* AIX */ + #define OS_FBD 0 /* FreeBSD */ ++#define OS_DFB 0 /* DragonFly */ + + + #ifdef THINK_C +@@ -212,6 +213,13 @@ Changes: + #define OS_FBD 1 + #endif + ++#ifdef __DragonFly__ ++#undef OS_UNX ++#define OS_UNX 1 ++#undef OS_DFB ++#define OS_DFB 1 ++#endif ++ + #if (OS_MAC + OS_UNX + OS_VMS + OS_DOS + OS_W32) == 0 + #error Error: No operating system class has been selected. + #endif +@@ -222,7 +230,7 @@ Changes: + + #if OS_UNX + #define OS_UNXSUM1 (OS_HPU+OS_OSF+OS_SUN+OS_SOL+OS_ULT) +-#define OS_UNXSUM2 (OS_IRX+OS_B86+OS_L86+OS_AIX+OS_FBD) ++#define OS_UNXSUM2 (OS_IRX+OS_B86+OS_L86+OS_AIX+OS_FBD+OS_DFB) + #if ((OS_UNXSUM1+OS_UNXSUM2) != 1) + #error Error: Exactly one Unix operating system must be chosen. + #endif