intervaltree: Clean up Makefile, add subst patch for i386

[Jason Bacon <bacon4000%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Fri Mar 30 12:39:22 2018 -0500
Changeset:	03baad337b63e346404ea8f9d433132e4286a3d8

Modified Files:
	intervaltree/Makefile

Log Message:
intervaltree: Clean up Makefile, add subst patch for i386

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=03baad337b63e346404ea8f9d433132e4286a3d8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 intervaltree/Makefile | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diffs:
diff --git a/intervaltree/Makefile b/intervaltree/Makefile
index 597c0efd0f..d14c1e5aa0 100644
--- a/intervaltree/Makefile
+++ b/intervaltree/Makefile
@@ -4,26 +4,6 @@
 #               Generated by fbsd2pkg                     #
 ###########################################################
 
-###########################################################
-# Unconverted and partially converted FreeBSD port syntax:
-
-# # Created by: Jason Bacon <bacon%NetBSD.org@localhost>
-# # $FreeBSD$
-# PLIST_FILES=	bin/interval_tree_test include/${PORTNAME}/IntervalTree.h
-# # GH_TAGNAME=	${PORTVERSION}
-# .include <bsd.port.pre.mk>
-# # Needs c++0x
-# .if ${OSVERSION} < 1000000
-# USE_GCC=	yes
-# .endif
-# # FIXME: Blind hack.  Not sure why this is necessary.
-# .if ${ARCH} == i386
-# post-patch:
-# 	${REINPLACE_CMD} -e 's|<bool, unsigned long>|<bool, unsigned int>|g' \
-# 		${WRKSRC}/interval_tree_test.cpp
-# .endif
-# .include <bsd.port.post.mk>
-
 DISTNAME=	intervaltree-0.0.0.20151213
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ekg/}
@@ -32,21 +12,18 @@ GITHUB_TAG=	8fc4be91866237995e1105689d84bece619f4663
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/ekg/intervaltree
 COMMENT=	Minimal C++ interval tree implementation
-# Double-check this
 LICENSE=	mit
 
-# Pessimistic assumption.  Test and change if possible.
-MAKE_JOBS_SAFE=	no
-
-# Just assuming C and C++: Adjust this!
 USE_LANGUAGES=	c c++
 
-# Adapt REINPLACE commands to SUBST:
-#SUBST_CLASSES+=
-#SUBST_STAGE.=	post-patch
-#SUBST_MESSAGE.=
-#SUBST_FILES.=
-#SUBST_SED.=
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == i386
+SUBST_CLASSES+=		bool
+SUBST_STAGE.bool=	post-patch
+SUBST_FILES.bool=	${WRKSRC}/interval_tree_test.cpp
+SUBST_SED.bool=		-e 's|<bool, unsigned long>|<bool, unsigned int>|g'
+.endif
 
 INSTALL_TARGET=	install-strip