multichoose: Update, use upstream, own Makefile

[Winston Weinert <winston%ml1.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Winston Weinert <winston%ml1.net@localhost>
Pushed By:	winston
Date:		Fri Mar 30 05:23:52 2018 -0500
Changeset:	1163fe76a0b004ae675fe8c9f5f38d5fd7b933eb

Modified Files:
	multichoose/Makefile
	multichoose/PLIST
	multichoose/buildlink3.mk
	multichoose/distinfo
Added Files:
	multichoose/files/Makefile

Log Message:
multichoose: Update, use upstream, own Makefile

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

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

diffstat:
 multichoose/Makefile       |  9 +++++----
 multichoose/PLIST          |  2 ++
 multichoose/buildlink3.mk  |  2 +-
 multichoose/distinfo       |  8 ++++----
 multichoose/files/Makefile | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 58 insertions(+), 9 deletions(-)

diffs:
diff --git a/multichoose/Makefile b/multichoose/Makefile
index e0591cdbbe..de6864b5be 100644
--- a/multichoose/Makefile
+++ b/multichoose/Makefile
@@ -4,10 +4,10 @@
 #               Generated by fbsd2pkg                     #
 ###########################################################
 
-DISTNAME=	multichoose-${PORTVERSION}
+DISTNAME=	multichoose-0.0.0.20151117
 CATEGORIES=	math
-MASTER_SITES=	${MASTER_SITE_GITHUB:=outpaddling/}
-GITHUB_TAG=	${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ekg/}
+GITHUB_TAG=	3b8d14e616c719de88261614f0e78195d8ed49e9
 
 MAINTAINER=	bacon%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/ekg/multichoose
@@ -19,6 +19,7 @@ USE_LANGUAGES=	c c++
 REPLACE_PYTHON=	*.py
 INSTALL_TARGET=	install-strip
 
-PORTVERSION=	d60d639af93f8720e019d824bb2405eb4523fb16
+pre-configure:
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multichoose/PLIST b/multichoose/PLIST
index 89f2d9da56..3412967736 100644
--- a/multichoose/PLIST
+++ b/multichoose/PLIST
@@ -1,6 +1,8 @@
 @comment $NetBSD$
 bin/cmultichoose
 bin/multichoose
+bin/multichoose.py
 bin/multipermute
+bin/multipermute.py
 include/multichoose/multichoose.h
 include/multichoose/multipermute.h
diff --git a/multichoose/buildlink3.mk b/multichoose/buildlink3.mk
index 96d7fe484e..f773f46fd9 100644
--- a/multichoose/buildlink3.mk
+++ b/multichoose/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	multichoose
 .if !defined(MULTICHOOSE_BUILDLINK3_MK)
 MULTICHOOSE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.multichoose+=	multichoose>=d60d639af93f8720e019d824bb2405eb4523fb16
+BUILDLINK_API_DEPENDS.multichoose+=	multichoose>=0.0.0.20151117
 BUILDLINK_PKGSRCDIR.multichoose?=	../../wip/multichoose
 .endif	# MULTICHOOSE_BUILDLINK3_MK
 
diff --git a/multichoose/distinfo b/multichoose/distinfo
index ea42918a97..f978369d4b 100644
--- a/multichoose/distinfo
+++ b/multichoose/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (multichoose-d60d639af93f8720e019d824bb2405eb4523fb16-d60d639af93f8720e019d824bb2405eb4523fb16.tar.gz) = 3b78c76c81235dc15821d07b5886d14069c9c5e2
-RMD160 (multichoose-d60d639af93f8720e019d824bb2405eb4523fb16-d60d639af93f8720e019d824bb2405eb4523fb16.tar.gz) = 1b82585a875e47306ff77e4a8d132c968f3ce87e
-SHA512 (multichoose-d60d639af93f8720e019d824bb2405eb4523fb16-d60d639af93f8720e019d824bb2405eb4523fb16.tar.gz) = d3e0919857eafc7cd6e3ee9abbb41b6ef95d48c406b95ab595a59413f8e760dc4e24357c333ee88fe4f132aa914c198f614b9fdb77af8da184b0c911919e54ac
-Size (multichoose-d60d639af93f8720e019d824bb2405eb4523fb16-d60d639af93f8720e019d824bb2405eb4523fb16.tar.gz) = 6860 bytes
+SHA1 (multichoose-0.0.0.20151117-3b8d14e616c719de88261614f0e78195d8ed49e9.tar.gz) = 7e8668650372dec974c9024b89319d120a7edf54
+RMD160 (multichoose-0.0.0.20151117-3b8d14e616c719de88261614f0e78195d8ed49e9.tar.gz) = 2de518cc97c5b0e2bb635e4673cd8434fefd2cff
+SHA512 (multichoose-0.0.0.20151117-3b8d14e616c719de88261614f0e78195d8ed49e9.tar.gz) = af300100ee40c9038b0a0bbdb5351cff68721176b968ae04ede7fb1cb9f8462eb46c6563e20f1ccba9a1058520b2b996d1fb675cb62ffa6c020cbacdc0dda2b9
+Size (multichoose-0.0.0.20151117-3b8d14e616c719de88261614f0e78195d8ed49e9.tar.gz) = 6551 bytes
diff --git a/multichoose/files/Makefile b/multichoose/files/Makefile
new file mode 100644
index 0000000000..4dbae01af9
--- /dev/null
+++ b/multichoose/files/Makefile
@@ -0,0 +1,46 @@
+
+# Use ?= to allow overriding from the env or command-line, e.g.
+#
+#       make CXXFLAGS="-O3 -fPIC" install
+#
+# Package managers will override many of these variables automatically, so
+# this is aimed at making it easy to create packages (Debian packages,
+# FreeBSD ports, MacPorts, pkgsrc, etc.)
+
+CC ?=		cc
+CXX ?=		c++
+DESTDIR ?=	stage
+PREFIX ?=	/usr/local
+MKDIR ?=	mkdir
+INSTALL ?=	install -c
+STRIP ?=	strip
+AR ?=		ar
+
+BINS =	multichoose cmultichoose multipermute
+
+all: ${BINS}
+
+#multichoose_recursive: multichoose_recursive.cpp
+#	${CXX} multichoose_recursive.cpp -o multichoose_recursive
+
+multichoose: multichoose.cpp multichoose.h
+	${CXX} multichoose.cpp -o multichoose
+
+multipermute: multipermute.cpp multipermute.h
+	${CXX} multipermute.cpp -o multipermute
+
+cmultichoose: multichoose.c
+	${CC} multichoose.c -o cmultichoose
+
+install: all
+	${MKDIR} -p ${DESTDIR}${PREFIX}/bin
+	${MKDIR} -p ${DESTDIR}${PREFIX}/include/multichoose
+	${INSTALL} ${BINS} ${DESTDIR}${PREFIX}/bin
+	${INSTALL} *.py ${DESTDIR}${PREFIX}/bin
+	${INSTALL} -m644 *.h ${DESTDIR}${PREFIX}/include/multichoose
+
+install-strip: install
+	${STRIP} ${DESTDIR}${PREFIX}/bin/*e
+
+clean:
+	rm -rf ${BINS} ${DESTDIR}