svn commit: r419782 - in head/devel/funnelweb: . files

[John Marino]

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 at 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 <bsd.port.mk>

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