mccs: pkglint cleanup and honor LDFLAGS.

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Thu Mar 19 14:12:50 2020 +0100
Changeset:	a31e39029b3e6324529002086fab35dafe71857b

Modified Files:
	mccs/DESCR
	mccs/Makefile
	mccs/distinfo
	mccs/options.mk
Added Files:
	mccs/patches/patch-makefile

Log Message:
mccs: pkglint cleanup and honor LDFLAGS.

Fixes RELRO build.

Fix path to glpk.

Add missing bison build dependency.

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

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

diffstat:
 mccs/DESCR                  | 18 +++++++++---------
 mccs/Makefile               | 11 ++++++-----
 mccs/distinfo               |  1 +
 mccs/options.mk             |  4 ++--
 mccs/patches/patch-makefile | 15 +++++++++++++++
 5 files changed, 33 insertions(+), 16 deletions(-)

diffs:
diff --git a/mccs/DESCR b/mccs/DESCR
index b513475a95..ec3f48b03c 100644
--- a/mccs/DESCR
+++ b/mccs/DESCR
@@ -1,12 +1,12 @@
-mccs (which stands for Multi Criteria CUDF Solver) provides a mean to
-solve cudf problems as defined in the MANCOOSI european project
+mccs (which stands for Multi Criteria CUDF Solver) provides a mean
+to solve cudf problems as defined in the MANCOOSI european project
 (http://www.mancoosi.org) and was partially supported by the European
-Community's 7th Framework Programme (FP7/2007-2013), MANCOOSI project,
-grant agreement n. 214898.
+Community's 7th Framework Programme (FP7/2007-2013), MANCOOSI
+project, grant agreement n. 214898.
 
-mccs has been developed under linux and has not been tested on other
-platforms.  The provided mccs is statically linked and run under linux
-32 bits.
+mccs has been developed under linux and has not been tested on
+other platforms.  The provided mccs is statically linked and run
+under linux 32 bits.
 
-mccs translate the cudf problem into an integer linear program which
-is then solved by an underlying solver.
\ No newline at end of file
+mccs translate the cudf problem into an integer linear program
+which is then solved by an underlying solver.
diff --git a/mccs/Makefile b/mccs/Makefile
index d85bd9244c..befd8f06f4 100644
--- a/mccs/Makefile
+++ b/mccs/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	mccs-1.1-srcs
-PKGNAME=	mccs-1.1
+PKGNAME=	${DISTNAME:S/-srcs//}
 CATEGORIES=	misc
 MASTER_SITES=	http://www.i3s.unice.fr/~cpjm/misc/
 EXTRACT_SUFX=	.tgz
@@ -11,12 +11,13 @@ HOMEPAGE=	http://www.i3s.unice.fr/~cpjm/misc/
 COMMENT=	Multi Criteria CUDF Solver
 LICENSE=	modified-bsd
 
-MAKE_FILE=      makefile
-USE_TOOLS+=	gmake
+MAKE_FILE=	makefile
+USE_TOOLS+=	bison gmake
 BUILD_TARGET=	mccs
 USE_LANGUAGES=	c c++
-WRKSRC= 	${WRKDIR}/mccs-1.1
-INSTALLATION_DIRS+=bin
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
+INSTALLATION_DIRS+=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mccs ${DESTDIR}${PREFIX}/bin/mccs
diff --git a/mccs/distinfo b/mccs/distinfo
index 2e160a6c7f..2800642e5d 100644
--- a/mccs/distinfo
+++ b/mccs/distinfo
@@ -5,6 +5,7 @@ RMD160 (mccs-1.1-srcs.tgz) = e6ee8542c021aced01f82a8992622eba39fc6766
 SHA512 (mccs-1.1-srcs.tgz) = 95cd0af58115202dc1bb8deaae28b25662e06cbbcb195c608a01083d4c602bcc1ede213dbc4e8ece7b9ab4afc9ef419fa57c284602dc0c908595e77710281de4
 Size (mccs-1.1-srcs.tgz) = 65553 bytes
 SHA1 (patch-make.local) = 174dd71f0c657f1398401b825a4c813b207d04ac
+SHA1 (patch-makefile) = b0c416c64feac457a7d68960dec669b53181866a
 SHA1 (patch-sources_leximax__combiner.c) = 16cf583cbca9971dfceb6ccb6f63ae20fce0fbb7
 SHA1 (patch-sources_leximin__combiner.c) = 5ab838bc1b7f67893e1e46bdd4807f694b55aaa5
 SHA1 (patch-sources_lexleximax__combiner.c) = 3b5715c0a85787ad73e2909fbf088172e33f1624
diff --git a/mccs/options.mk b/mccs/options.mk
index b8a584b6a3..63363df73b 100644
--- a/mccs/options.mk
+++ b/mccs/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mccs
-PKG_OPTIONS_REQUIRED_GROUP=	solver
+PKG_OPTIONS_REQUIRED_GROUPS=	solver
 PKG_OPTIONS_GROUP.solver=	lpsolve glpk
 PKG_SUPPORTED_OPTIONS=		lpsolve glpk
 PKG_SUGGESTED_OPTIONS=		lpsolve
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=		lpsolve
 
 .if !empty(PKG_OPTIONS:Mglpk)
 BUILD_MAKE_FLAGS+=USEGLPK=1
-.include "../../math/glkp/buildlink3.mk"
+.include "../../math/glpk/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mlpsolve)
diff --git a/mccs/patches/patch-makefile b/mccs/patches/patch-makefile
new file mode 100644
index 0000000000..0496dc2939
--- /dev/null
+++ b/mccs/patches/patch-makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Honor LDFLAGS.
+
+--- makefile.orig	2011-06-19 20:56:20.000000000 +0000
++++ makefile
+@@ -52,7 +52,7 @@ endif
+ 
+ # to make mccs solver
+ mccs:  $(OBJS) libccudf.a
+-	$(CCC) -o mccs $(OBJS) -lfl -L. -lccudf \
++	$(CCC) -o mccs $(OBJS) -lfl -L. -lccudf $(LDFLAGS) \
+ 		$(CPXLD) \
+ 		$(GUROBILD) \
+ 		$(LPSOLVELD) \