Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Jan 2017 09:01:23 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432906 - head/math/glpk
Message-ID:  <201701310901.v0V91NWC062038@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Jan 31 09:01:23 2017
New Revision: 432906
URL: https://svnweb.freebsd.org/changeset/ports/432906

Log:
  - Fix LICENSE
  - Add LICENSE_FILE
  - Fix CONFLICTS
  - Strip library
  - Switch to new test framework
  - Simplify docs installation

Modified:
  head/math/glpk/Makefile

Modified: head/math/glpk/Makefile
==============================================================================
--- head/math/glpk/Makefile	Tue Jan 31 08:53:48 2017	(r432905)
+++ head/math/glpk/Makefile	Tue Jan 31 09:01:23 2017	(r432906)
@@ -3,28 +3,30 @@
 
 PORTNAME=	glpk
 PORTVERSION=	4.55
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Linear Programming Kit
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
+CONFLICTS=	goblin-[0-9]*
+
 GNU_CONFIGURE=	yes
 USES=		gmake libtool localbase
 USE_LDCONFIG=	yes
 CFLAGS+=	-trigraphs
 CPPFLAGS+=	-D_LSEEK_DECLARED
-CONFIGURE_ARGS+=	--with-gmp
-CONFLICTS=	goblin-[0-9]*
+CONFIGURE_ARGS=	--with-gmp
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
-DOCS1=		cnfsat.pdf glpk.pdf gmpl.pdf graphs.pdf miplib2.txt \
-		miplib3.txt netlib.txt
-DOCS2=		dfeas.pdf gomory.pdf keller.pdf scaling.pdf
-PORTDOCS=	${DOCS1} ${DOCS2}
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	IODBC MYSQL DOCS
 
@@ -40,14 +42,13 @@ MYSQL_USES=		mysql
 
 post-patch:
 	@${REINPLACE_CMD} -e "s;\/usr\/include\/mysql;${LOCALBASE}\/include\/mysql;g" \
-	${WRKSRC}/configure
+		${WRKSRC}/configure
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc ; \
-	${INSTALL_DATA} ${DOCS1} ${DOCS2:S|^|notes/|} ${STAGEDIR}${DOCSDIR}
-
-check regression-test test: build
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} cnfsat.pdf glpk.pdf gmpl.pdf \
+		graphs.pdf miplib2.txt miplib3.txt netlib.txt ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc/notes && ${INSTALL_DATA} dfeas.pdf gomory.pdf \
+		keller.pdf scaling.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701310901.v0V91NWC062038>